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

login
register
mail settings
Submitter phabricator
Date Feb. 27, 2020, 6:30 p.m.
Message ID <ab9d99d383611a23cd80fad474831831@localhost.localdomain>
Download mbox | patch
Permalink /patch/45368/
State Not Applicable
Headers show

Comments

phabricator - Feb. 27, 2020, 6:30 p.m.
Closed by commit rHG382f4f09f0bd: tests: add tests of debugmergestate with unresolved/resolved path conflicts (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8119?vs=20213&id=20363

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

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

AFFECTED FILES
  tests/test-pathconflicts-merge.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

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)"