Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies-tests: update to null in test-copies-chain-merge.t
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 14 Dec 2020 12:08:56 +0100
changeset 46186 5f27924a201d
parent 46185 5f00eb608957
child 46187 95d6f31e88db
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
tests/test-copies-chain-merge.t file | annotate | diff | comparison | revisions 
--- 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
   | |/
mercurial