Commits

Augie Fackler  committed 3a58fe4

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

  • Participants
  • Parent commits 50698ff

Comments (0)

Files changed (4)

File tests/test-conflict-1

 hg init hgrepo1
 cd hgrepo1
 echo A > afile
-hg add afile 
+hg add afile
 hg ci -m "origin"
 
 echo B > afile
 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

File tests/test-conflict-1.out

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

File tests/test-conflict-2

 hg init hgrepo1
 cd hgrepo1
 echo A > afile
-hg add afile 
+hg add afile
 hg ci -m "origin"
 
 echo B > afile
 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

File tests/test-conflict-2.out

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