Skip to content
Snippets Groups Projects
Commit 3a58fe45 authored by Augie Fackler's avatar Augie Fackler
Browse files

test-conflict-{1,2}: cope with minor hg output variations

parent 50698ff6
No related branches found
No related tags found
No related merge requests found
......@@ -17,7 +17,7 @@
hg init hgrepo1
cd hgrepo1
echo A > afile
hg add afile
hg add afile
hg ci -m "origin"
echo B > afile
......@@ -27,7 +27,7 @@
echo C > afile
hg ci -m "A->C"
hg merge -r1
hg merge -r1 | sed 's/-C ./-C/' | grep -v 'merging afile'
# resolve using first parent
echo C > afile
hg resolve -m afile
......
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging afile
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
......@@ -4,7 +3,7 @@
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
@ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test
|\ merge to C
| |
......
......@@ -17,7 +17,7 @@
hg init hgrepo1
cd hgrepo1
echo A > afile
hg add afile
hg add afile
hg ci -m "origin"
echo B > afile
......@@ -27,7 +27,7 @@
echo C > afile
hg ci -m "A->C"
hg merge -r1
hg merge -r1 | sed 's/-C ./-C/' | grep -v 'merging afile'
# resolve using second parent
echo B > afile
hg resolve -m afile
......
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging afile
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
......@@ -4,7 +3,7 @@
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
@ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test
|\ merge to B
| |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment