Mercurial > hg > hg-git

changeset 468:f7f32bc9107b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: cope with change in git merge output format
author Augie Fackler <raf@durin42.com>
date Tue, 31 Jul 2012 17:08:37 -0500
parents af0e70e5b8b7
children 7f485ed8a463
files tests/test-merge tests/test-merge.out tests/test-octopus tests/test-octopus.out
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge
+++ b/tests/test-merge
@@ -48,7 +48,7 @@
 commit -m 'add gamma'
 
 # clean merge
-git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//'
+git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| +/| /'
 
 cd ..
 mkdir gitrepo2
--- a/tests/test-merge.out
+++ b/tests/test-merge.out
@@ -3,7 +3,7 @@
 Switched to a new branch "beta"
 Switched to branch "master"
 Merge successful
- beta |    1 +
+ beta | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 beta
 Initialized empty Git repository in gitrepo2/
--- a/tests/test-octopus
+++ b/tests/test-octopus
@@ -53,7 +53,7 @@
 git add delta
 commit -m 'add delta'
 
-git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//'
+git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//'  | sed 's/| +/| /'
 
 cd ..
 mkdir gitrepo2
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -6,8 +6,8 @@
 Trying simple merge with branch1
 Trying simple merge with branch2
 Merge successful
- beta  |    1 +
- gamma |    1 +
+ beta  | 1 +
+ gamma | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 beta
  create mode 100644 gamma