Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-copies-chain-merge.t
changeset 46540 311a18777f45
parent 46539 a1a06dca6941
child 46541 60c52bdb1784 
--- a/tests/test-copies-chain-merge.t	Tue Feb 16 05:54:55 2021 +0100
+++ b/tests/test-copies-chain-merge.t	Tue Feb 16 05:58:22 2021 +0100
@@ -579,13 +579,15 @@
 In this case, the file keep on living after the merge. So we should not drop its
 copy tracing chain.
 
+  $ case_desc="merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge)"
+
   $ hg up 'desc("c-1")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert --rev 'desc("b-1")' d
-  $ hg ci -m "mCB-revert-m-0"
+  $ hg ci -m "mCB-revert-m-0 $case_desc - one way"
   created new head
 
   $ hg up 'desc("b-1")'
@@ -594,13 +596,13 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert --rev 'desc("b-1")' d
-  $ hg ci -m "mBC-revert-m-0"
+  $ hg ci -m "mBC-revert-m-0 $case_desc - the other way"
   created new head
 
   $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
-  @    33 mBC-revert-m-0
+  @    33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   |\
-  +---o  32 mCB-revert-m-0
+  +---o  32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   | |/
   | o  6 c-1 delete d
   | |
@@ -687,12 +689,12 @@
   mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
   mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
-  mBC-revert-m-0
+  mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
   mBCm-1 re-add d
   mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   mBFm-0 simple merge - one way
-  mCB-revert-m-0
+  mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
   mCBm-1 re-add d
   mCGm-0 merge updated/deleted - revive the file (updated content) - one way
@@ -1694,9 +1696,9 @@
 copy tracing chain.
 
   $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
-  o    33 mBC-revert-m-0
+  o    33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
   |\
-  +---o  32 mCB-revert-m-0
+  +---o  32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
   | |/
   | o  6 c-1 delete d
   | |
mercurial