# HG changeset patch # User Mads Kiilerich # Date 1485829207 -3600 # Node ID 72c36a2be2d69f80916f9b0b3f25e368314d4156 # Parent 0126e422450e28efd7303767ef1363e6fbd2f210 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 -r 0126e422450e -r 72c36a2be2d6 tests/test-merge-criss-cross.t --- a/tests/test-merge-criss-cross.t Mon Jan 30 22:58:56 2017 -0800 +++ b/tests/test-merge-criss-cross.t Tue Jan 31 03:20:07 2017 +0100 @@ -93,24 +93,31 @@ 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 @@ 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 @@ 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: