Mercurial > hg-git

changeset 407:3a58fe455b0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-conflict-{1,2}: cope with minor hg output variations
author Augie Fackler <durin42@gmail.com>
date Wed, 25 May 2011 09:25:34 -0500
parents 50698ff64c41
children 2dcfd4bbfc1a
files tests/test-conflict-1 tests/test-conflict-1.out tests/test-conflict-2 tests/test-conflict-2.out
diffstat 4 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict-1	Tue May 24 20:04:10 2011 +0200
+++ b/tests/test-conflict-1	Wed May 25 09:25:34 2011 -0500
@@ -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
--- a/tests/test-conflict-1.out	Tue May 24 20:04:10 2011 +0200
+++ b/tests/test-conflict-1.out	Wed May 25 09:25:34 2011 -0500
@@ -1,10 +1,9 @@
 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
 | |
--- a/tests/test-conflict-2	Tue May 24 20:04:10 2011 +0200
+++ b/tests/test-conflict-2	Wed May 25 09:25:34 2011 -0500
@@ -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
--- a/tests/test-conflict-2.out	Tue May 24 20:04:10 2011 +0200
+++ b/tests/test-conflict-2.out	Wed May 25 09:25:34 2011 -0500
@@ -1,10 +1,9 @@
 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
 | |