[Updated] D9029: tests: add some more debugmergestate calls in `test-merge-criss-cross.t`

[pulkit (Pulkit Goyal)]

Closed by commit rHG8c02c6262a5e: tests: add some more debugmergestate calls in `test-merge-criss-cross.t` (authored by pulkit).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D9029?vs=22674&id=22875#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D9029?vs=22674&id=22875

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9029/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D9029

AFFECTED FILES
  tests/test-merge-criss-cross.t

CHANGE DETAILS

diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t
+++ b/tests/test-merge-criss-cross.t
@@ -659,6 +659,8 @@
   (branch merge, don't forget to commit)
   $ ls -1
   other-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -673,6 +675,16 @@
   other-file
   the-file (newfilenode !)
 
+#if newfilenode
+  $ hg debugmergestate
+  local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
+  other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
+  extra: the-file (merge-removal-candidate = yes)
+#else
+  $ hg debugmergestate
+  no merge state found
+#endif
+
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
 
@@ -684,6 +696,8 @@
   (branch merge, don't forget to commit)
   $ ls -1
   other-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging two deletion together → no conflict)
 
@@ -694,6 +708,8 @@
   (branch merge, don't forget to commit)
   $ ls -1
   other-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -707,6 +723,15 @@
   $ ls -1
   other-file
   the-file (newfilenode !)
+#if newfilenode
+  $ hg debugmergestate
+  local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e
+  other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
+  extra: the-file (merge-removal-candidate = yes)
+#else
+  $ hg debugmergestate
+  no merge state found
+#endif
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -719,6 +744,8 @@
   (branch merge, don't forget to commit)
   $ ls -1
   other-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging two "keeping" together → no conflict)
 
@@ -731,6 +758,15 @@
   $ ls -1
   other-file
   the-file
+#if newfilenode
+  $ hg debugmergestate
+  local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
+  other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
+  extra: the-file (filenode-source = other)
+#else
+  $ hg debugmergestate
+  no merge state found
+#endif
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -744,6 +780,8 @@
   $ ls -1
   other-file
   the-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -756,6 +794,8 @@
   $ ls -1
   other-file
   the-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging two "keeping" together → no conflict)
 
@@ -768,6 +808,8 @@
   $ ls -1
   other-file
   the-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -780,6 +822,8 @@
   $ ls -1
   other-file
   the-file
+  $ hg debugmergestate
+  no merge state found
 
 (merging a deletion with keeping → conflict)
 BROKEN: this should result in conflict
@@ -792,3 +836,12 @@
   $ ls -1
   other-file
   the-file
+#if newfilenode
+  $ hg debugmergestate
+  local (working copy): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
+  other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e
+  extra: the-file (merge-removal-candidate = yes)
+#else
+  $ hg debugmergestate
+  no merge state found
+#endif



To: pulkit, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200928/1b8b9fb1/attachment-0002.html>