Mercurial > hg-git
changeset 438:a67f5bafc6eb
tests: accomodate changes in git-merge output
Since git v1.7.7, merge outputs its status in the form
Merge made by the * strategy.
Use a regex substitution, so that older versions are handled
successfully as well.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
| author | Tay Ray Chuan <rctay89@gmail.com> |
|---|---|
| date | Sun, 09 Oct 2011 13:39:37 -0500 |
| parents | 4bb2a81ce221 |
| children | 3f45c88100e8 |
| 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 Tue Sep 13 18:16:04 2011 -0500 +++ b/tests/test-merge Sun Oct 09 13:39:37 2011 -0500 @@ -48,7 +48,7 @@ commit -m 'add gamma' # clean merge -git merge beta +git merge beta | sed 's/^Merge.*recursive.*$/Merge successful/' cd .. mkdir gitrepo2
--- a/tests/test-merge.out Tue Sep 13 18:16:04 2011 -0500 +++ b/tests/test-merge.out Sun Oct 09 13:39:37 2011 -0500 @@ -2,7 +2,7 @@ Switched to a new branch "beta" Switched to branch "master" -Merge made by recursive. +Merge successful beta | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 beta
--- a/tests/test-octopus Tue Sep 13 18:16:04 2011 -0500 +++ b/tests/test-octopus Sun Oct 09 13:39:37 2011 -0500 @@ -53,7 +53,7 @@ git add delta commit -m 'add delta' -git merge branch1 branch2 +git merge branch1 branch2 | sed 's/^Merge.*octopus.*$/Merge successful/' cd .. mkdir gitrepo2
--- a/tests/test-octopus.out Tue Sep 13 18:16:04 2011 -0500 +++ b/tests/test-octopus.out Sun Oct 09 13:39:37 2011 -0500 @@ -5,7 +5,7 @@ Switched to branch "master" Trying simple merge with branch1 Trying simple merge with branch2 -Merge made by octopus. +Merge successful beta | 1 + gamma | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)