Mercurial > hg

changeset 45618:29c1d2401823

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix a typo in `desc()` revset in test-merge-criss-cross.t I was looking into fixing the broken behavior only to find out that we had a typo in the commit message and merge was not performed.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 30 Sep 2020 17:51:40 +0530
parents ad984583969a
children e8078af6af30
files tests/test-merge-criss-cross.t
diffstat 1 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge-criss-cross.t	Wed Sep 30 15:46:54 2020 +0530
+++ b/tests/test-merge-criss-cross.t	Wed Sep 30 17:51:40 2020 +0530
@@ -813,14 +813,16 @@
   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
-  $ hg merge          'desc("merge-deleted-the-file-from-deleted")'
-  abort: empty revision set
-  [255]
+  $ hg merge          'desc("merge-deleting-the-file-from-deleted")'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
   $ ls -1
   other-file
   the-file
   $ hg debugmergestate
-  no merge state found
+  local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
+  other (merge rev): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
+  extra: the-file (merge-removal-candidate = yes)
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -857,14 +859,17 @@
 
   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg merge          'desc("merge-deleted-the-file-from-deleted")'
-  abort: empty revision set
-  [255]
+  $ hg merge          'desc("merge-deleting-the-file-from-deleted")'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
   $ ls -1
   other-file
   the-file
   $ hg debugmergestate
-  no merge state found
+  local (working copy): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78 (newfilenode !)
+  local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a (old !)
+  other (merge rev): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
+  extra: the-file (merge-removal-candidate = yes)
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict