D8119: tests: add tests of debugmergestate with unresolved/resolved path conflicts

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

D8119: tests: add tests of debugmergestate with unresolved/resolved path conflicts

marmoute (Pierre-Yves David)
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I'm about to change `hg debugmergestate` and it broke on these "pu"
  and "pr" records on my first attempt (D8113 <https://phab.mercurial-scm.org/D8113>), so let's add test
  coverage.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  tests/test-pathconflicts-merge.t

CHANGE DETAILS

diff --git a/tests/test-pathconflicts-merge.t b/tests/test-pathconflicts-merge.t
--- a/tests/test-pathconflicts-merge.t
+++ b/tests/test-pathconflicts-merge.t
@@ -75,6 +75,14 @@
   M a/b/c/d
   A a/b~0ed027b96f31
   R a/b
+  $ hg debugmergestate
+  * version 2 records
+  local: 0ed027b96f31a2560c8abe689ba59876409a2b8e
+  other: 9049d9534d5c5d16264aab02b4b9e20d03faabef
+  labels:
+    local: working copy
+    other: merge rev
+  unrecognized entry: P a/b pu a/b~0ed027b96f31 l
   $ hg resolve --all
   a/b: path conflict must be resolved manually
   $ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31
@@ -106,6 +114,14 @@
   $ hg mv a/b~2ea68033e3be a/b.old
   $ hg resolve --mark a/b
   (no more unresolved files)
+  $ hg debugmergestate
+  * version 2 records
+  local: 2ea68033e3be03a560471c1fc9e5704fbedb9b4b
+  other: 9049d9534d5c5d16264aab02b4b9e20d03faabef
+  labels:
+    local: working copy
+    other: merge rev
+  unrecognized entry: P a/b pr a/b~2ea68033e3be l
   $ hg resolve --list
   R a/b
   $ hg commit -m "merge link and dir (renamed link)"



To: martinvonz, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel