Patchwork [2,of,6,resolve-ux] resolve: split test

login
register
mail settings
Submitter Gregory Szorc
Date May 2, 2014, 5:47 a.m.
Message ID <812bb7bf59e8ff0e2e60.1399009657@vm-ubuntu-main.gateway.sonic.net>
Download mbox | patch
Permalink /patch/4487/
State Superseded
Headers show

Comments

Gregory Szorc - May 2, 2014, 5:47 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1397870802 25200
#      Fri Apr 18 18:26:42 2014 -0700
# Branch stable
# Node ID 812bb7bf59e8ff0e2e60c1d73857206c6efd8b32
# Parent  c7fce11e072d77d7774616eadc0579c1a43b8837
resolve: split test

Part of test-resolve.t is split into multiple tests to create an
injection point for new tests that will be added in subsequent patches.

Patch

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -21,16 +21,23 @@  create a second head
 
 failing merge
 
   $ hg merge --tool=internal:fail
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
+resolve -l should contain an unresolved entry
+
+  $ hg resolve -l
+  U file
+
+resolve the failure
+
   $ echo resolved > file
   $ hg resolve -m file
   $ hg commit -m 'resolved'
 
 resolve -l, should be empty
 
   $ hg resolve -l