##// END OF EJS Templates
tests: add tests of debugmergestate with unresolved/resolved path conflicts...
Martin von Zweigbergk -
r44879:382f4f09 default
parent child Browse files
Show More
@@ -75,6 +75,14 b' Merge - local file conflicts with remote'
75 M a/b/c/d
75 M a/b/c/d
76 A a/b~0ed027b96f31
76 A a/b~0ed027b96f31
77 R a/b
77 R a/b
78 $ hg debugmergestate
79 * version 2 records
80 local: 0ed027b96f31a2560c8abe689ba59876409a2b8e
81 other: 9049d9534d5c5d16264aab02b4b9e20d03faabef
82 labels:
83 local: working copy
84 other: merge rev
85 unrecognized entry: P a/b pu a/b~0ed027b96f31 l
78 $ hg resolve --all
86 $ hg resolve --all
79 a/b: path conflict must be resolved manually
87 a/b: path conflict must be resolved manually
80 $ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31
88 $ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31
@@ -106,6 +114,14 b' Merge - local symlink conflicts with rem'
106 $ hg mv a/b~2ea68033e3be a/b.old
114 $ hg mv a/b~2ea68033e3be a/b.old
107 $ hg resolve --mark a/b
115 $ hg resolve --mark a/b
108 (no more unresolved files)
116 (no more unresolved files)
117 $ hg debugmergestate
118 * version 2 records
119 local: 2ea68033e3be03a560471c1fc9e5704fbedb9b4b
120 other: 9049d9534d5c5d16264aab02b4b9e20d03faabef
121 labels:
122 local: working copy
123 other: merge rev
124 unrecognized entry: P a/b pr a/b~2ea68033e3be l
109 $ hg resolve --list
125 $ hg resolve --list
110 R a/b
126 R a/b
111 $ hg commit -m "merge link and dir (renamed link)"
127 $ hg commit -m "merge link and dir (renamed link)"
General Comments 0
You need to be logged in to leave comments. Login now