Commit f0234ce8 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: spell out hg resolve

See previous commits for the rationale.
parent c0b439f14260
......@@ -376,7 +376,7 @@ is parent of one of the divergents and merging divergent leads to conflicts
this test case is mainly to test that we hit merge conlict while merging the
two divergent csets, so resolving this one which happened during relocation
$ echo a > a
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......
......@@ -274,7 +274,7 @@ add some changes on "other" side, to check later that merging performed correctl
(see 'hg help evolve.interrupted')
[240]
$ echo c > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -303,7 +303,7 @@ add some changes on "other" side, to check later that merging performed correctl
+new_file
$ echo c > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve -c
......@@ -545,7 +545,7 @@ Let's try to evolve stack
[240]
$ echo b > b
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
......@@ -558,7 +558,7 @@ Let's try to evolve stack
[240]
$ echo b > b
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
......@@ -867,7 +867,7 @@ Again, let's evolve the stack
[240]
$ echo foo > b
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
......
......@@ -415,7 +415,7 @@ Change phase to public for one head:
+e
$ echo c > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......
......@@ -287,7 +287,7 @@ Testing when same parent, merging conflict:
+>>>>>>> other: 229da2719b19 - test: added ch
$ echo ch > ch
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -390,7 +390,7 @@ Testing when different parent, relocation conflict:
[240]
$ echo c > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -495,7 +495,7 @@ Testing when different parent, merging conflict:
[240]
$ echo dh > dh
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -598,7 +598,7 @@ Testing when different parent, conflict in relocation and merging:
[240]
$ echo c > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -612,7 +612,7 @@ Testing when different parent, conflict in relocation and merging:
[240]
$ echo dh > dh
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......
......@@ -385,7 +385,7 @@ Change phase to public for one head:
+e
$ echo c > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -495,7 +495,7 @@ Change phase to public for one head:
[240]
$ echo d > d
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -608,7 +608,7 @@ Change phase to public for one head:
+e
$ echo cfoo > c
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......@@ -622,7 +622,7 @@ Change phase to public for one head:
[240]
$ echo d > d
$ hg res -m
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment