[PATCH 1 of 2 stable] tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich
mads at kiilerich.com
Tue Jan 31 02:26:51 UTC 2017
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1485829207 -3600
# Tue Jan 31 03:20:07 2017 +0100
# Branch stable
# Node ID f1cb9a55f1ff7251d85ff60ff5a190c183f1a012
# Parent cdeb0804d98ceeb1fde103f2d7b4f1864d7a95b9
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Prepare for adding a test case with files in a directory.
diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t
+++ b/tests/test-merge-criss-cross.t
@@ -93,24 +93,31 @@ Criss cross merging
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
- $ head *
- ==> f1 <==
+ $ f --dump *
+ f1:
+ >>>
5 second change
-
- ==> f2 <==
+ <<<
+ f2:
+ >>>
6 second change
-
- ==> f2.base <==
+ <<<
+ f2.base:
+ >>>
0 base
-
- ==> f2.local <==
+ <<<
+ f2.local:
+ >>>
6 second change
-
- ==> f2.orig <==
+ <<<
+ f2.orig:
+ >>>
6 second change
-
- ==> f2.other <==
+ <<<
+ f2.other:
+ >>>
2 first change
+ <<<
$ hg up -qC .
$ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d"
@@ -156,12 +163,15 @@ Redo merge with merge.preferancestor="*"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
- $ head *
- ==> f1 <==
+ $ f --dump *
+ f1:
+ >>>
5 second change
-
- ==> f2 <==
+ <<<
+ f2:
+ >>>
6 second change
+ <<<
The other way around:
@@ -198,12 +208,15 @@ The other way around:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
- $ head *
- ==> f1 <==
+ $ f --dump *
+ f1:
+ >>>
5 second change
-
- ==> f2 <==
+ <<<
+ f2:
+ >>>
6 second change
+ <<<
Verify how the output looks and and how verbose it is:
More information about the Mercurial-devel
mailing list