facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

tests: cope with change in git merge output format

Browse Source
This commit is contained in:
Augie Fackler 2012-07-31 17:08:37 -05:00
parent f89059b98d
commit 58e29c9254
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test-merge
View File

@ -48,7 +48,7 @@ git add gamma
commit -m 'add gamma' commit -m 'add gamma'
# clean merge # 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 .. cd ..
mkdir gitrepo2 mkdir gitrepo2

2
tests/test-merge.out
View File

@ -3,7 +3,7 @@ Initialized empty Git repository in gitrepo/.git/
Switched to a new branch "beta" Switched to a new branch "beta"
Switched to branch "master" Switched to branch "master"
Merge successful Merge successful
beta | 1 + beta | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
create mode 100644 beta create mode 100644 beta
Initialized empty Git repository in gitrepo2/ Initialized empty Git repository in gitrepo2/

2
tests/test-octopus
View File

@ -53,7 +53,7 @@ echo delta > delta
git add delta git add delta
commit -m '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 .. cd ..
mkdir gitrepo2 mkdir gitrepo2

4
tests/test-octopus.out
View File

@ -6,8 +6,8 @@ Switched to branch "master"
Trying simple merge with branch1 Trying simple merge with branch1
Trying simple merge with branch2 Trying simple merge with branch2
Merge successful Merge successful
beta | 1 + beta | 1 +
gamma | 1 + gamma | 1 +
2 files changed, 2 insertions(+) 2 files changed, 2 insertions(+)
create mode 100644 beta create mode 100644 beta
create mode 100644 gamma create mode 100644 gamma