Mercurial > hg
changeset 30855:72c36a2be2d6 stable
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.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 31 Jan 2017 03:20:07 +0100 |
| parents | 0126e422450e |
| children | 41f6af50c0d8 |
| files | tests/test-merge-criss-cross.t |
| diffstat | 1 files changed, 33 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- 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: