Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
This instance will be upgraded to Heptapod 17.9.0 final on 2025-04-04 between 14:00 and 15:00 UTC+2
Show more breadcrumbs
mercurial
hg-git
Commits
f7f32bc9
Commit
f7f32bc9
authored
12 years ago
by
durin42
Browse files
Options
Downloads
Patches
Plain Diff
tests: cope with change in git merge output format
parent
af0e70e5
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
tests/test-merge
+1
-1
1 addition, 1 deletion
tests/test-merge
tests/test-merge.out
+1
-1
1 addition, 1 deletion
tests/test-merge.out
tests/test-octopus
+1
-1
1 addition, 1 deletion
tests/test-octopus
tests/test-octopus.out
+2
-2
2 additions, 2 deletions
tests/test-octopus.out
with
5 additions
and
5 deletions
tests/test-merge
+
1
−
1
View file @
f7f32bc9
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
tests/test-merge.out
+
1
−
1
View file @
f7f32bc9
...
...
@@ -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/
...
...
This diff is collapsed.
Click to expand it.
tests/test-octopus
+
1
−
1
View file @
f7f32bc9
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
tests/test-octopus.out
+
2
−
2
View file @
f7f32bc9
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment