[PATCH 6 of 6 mergedriver] test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal
sid0 at fb.com
Tue Nov 24 16:02:41 CST 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1448315156 28800
# Mon Nov 23 13:45:56 2015 -0800
# Node ID a73a82a111e476554b0d089b836ac985cdb9569c
# Parent 50ae01719de5fdada5e3d3f5d530a41dd56b0253
# Available At http://42.netv6.net/sid0-wip/hg/
# hg pull http://42.netv6.net/sid0-wip/hg/ -r a73a82a111e4
test-merge-changedelete.t: add resolve --list output
We're going to move change/delete conflicts to the resolve phase, and the
resolve --list output is one of the things that will be important to test.
diff --git a/tests/test-merge-changedelete.t b/tests/test-merge-changedelete.t
--- a/tests/test-merge-changedelete.t
+++ b/tests/test-merge-changedelete.t
@@ -11,6 +11,8 @@ Make sure HGMERGE doesn't interfere with
$ status() {
> echo "--- status ---"
> hg st -A file1 file2 file3
+ > echo "--- resolve --list ---"
+ > hg resolve --list file1 file2 file3
> for file in file1 file2 file3; do
> if [ -f $file ]; then
> echo "--- $file ---"
@@ -64,6 +66,8 @@ Non-interactive merge:
M file2
M file3
C file1
+ --- resolve --list ---
+ U file3
--- file1 ---
1
changed
@@ -103,6 +107,8 @@ Interactive merge:
file2: * (glob)
M file3
C file1
+ --- resolve --list ---
+ U file3
--- file1 ---
1
changed
@@ -152,6 +158,8 @@ Interactive merge with bad input:
M file2
M file3
R file1
+ --- resolve --list ---
+ U file3
*** file1 does not exist
--- file2 ---
2
@@ -184,6 +192,7 @@ Interactive merge with not enough input:
file2: * (glob)
C file1
C file3
+ --- resolve --list ---
--- file1 ---
1
changed
@@ -209,6 +218,7 @@ Non-interactive linear update
A file1
C file2
C file3
+ --- resolve --list ---
--- file1 ---
1
changed
More information about the Mercurial-devel
mailing list