Mercurial > hg > hg-git

changeset 457:e688147a4936

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: cope with yet another git output format change
author Augie Fackler <raf@durin42.com>
date Sat, 21 Apr 2012 12:37:08 -0500
parents 4ed0d8dac6e7
children dfb2b7b5d586
files tests/test-merge tests/test-merge.out tests/test-octopus tests/test-octopus.out
diffstat 4 files changed, 4 insertions(+), 4 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/'
+git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//'
 
 cd ..
 mkdir gitrepo2
--- a/tests/test-merge.out
+++ b/tests/test-merge.out
@@ -4,7 +4,7 @@
 Switched to branch "master"
 Merge successful
  beta |    1 +
- 1 file changed, 1 insertion(+), 0 deletions(-)
+ 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/'
+git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//'
 
 cd ..
 mkdir gitrepo2
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -8,7 +8,7 @@
 Merge successful
  beta  |    1 +
  gamma |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
  create mode 100644 beta
  create mode 100644 gamma
 Initialized empty Git repository in gitrepo2/