# HG changeset patch # User Pierre-Yves David # Date 1607944136 -3600 # Node ID 5f27924a201d94bd82a14eb048578a39f8d7406c # Parent 5f00eb608957a2e142d28d83d1e8a16e99abecb7 copies-tests: update to null in test-copies-chain-merge.t This avoid some unrelated output changeset when adding more cases. Differential Revision: https://phab.mercurial-scm.org/D9589 diff -r 5f00eb608957 -r 5f27924a201d tests/test-copies-chain-merge.t --- a/tests/test-copies-chain-merge.t Mon Dec 14 12:08:16 2020 +0100 +++ b/tests/test-copies-chain-merge.t Mon Dec 14 12:08:56 2020 +0100 @@ -633,6 +633,8 @@ Summary of all created cases ---------------------------- + $ hg up --quiet null + (This exists to help keeping a compact list of the various cases we have built) $ hg log -T '{desc|firstline}\n'| sort @@ -1713,7 +1715,7 @@ (the copy information from the branch that was not deleted should win). $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' - @ 36 mHC-delete-before-conflict-m-0 + o 36 mHC-delete-before-conflict-m-0 |\ +---o 35 mCH-delete-before-conflict-m-0 | |/