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
Show more breadcrumbs
mercurial
hg-git
Commits
3a58fe45
Commit
3a58fe45
authored
13 years ago
by
Augie Fackler
Browse files
Options
Downloads
Patches
Plain Diff
test-conflict-{1,2}: cope with minor hg output variations
parent
50698ff6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
tests/test-conflict-1
+2
-2
2 additions, 2 deletions
tests/test-conflict-1
tests/test-conflict-1.out
+1
-2
1 addition, 2 deletions
tests/test-conflict-1.out
tests/test-conflict-2
+2
-2
2 additions, 2 deletions
tests/test-conflict-2
tests/test-conflict-2.out
+1
-2
1 addition, 2 deletions
tests/test-conflict-2.out
with
6 additions
and
8 deletions
tests/test-conflict-1
+
2
−
2
View file @
3a58fe45
...
...
@@ -17,7 +17,7 @@
hg init hgrepo1
cd
hgrepo1
echo
A
>
afile
hg add afile
hg add afile
hg ci
-m
"origin"
echo
B
>
afile
...
...
@@ -27,7 +27,7 @@
echo
C
>
afile
hg ci
-m
"A->C"
hg merge
-r1
hg merge
-r1
|
sed
's/-C ./-C/'
|
grep
-v
'merging afile'
# resolve using first parent
echo
C
>
afile
hg resolve
-m
afile
...
...
This diff is collapsed.
Click to expand it.
tests/test-conflict-1.out
+
1
−
2
View file @
3a58fe45
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging afile
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
...
...
@@ -4,7 +3,7 @@
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C
.
' to abandon
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
@ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test
|\ merge to C
| |
...
...
This diff is collapsed.
Click to expand it.
tests/test-conflict-2
+
2
−
2
View file @
3a58fe45
...
...
@@ -17,7 +17,7 @@
hg init hgrepo1
cd
hgrepo1
echo
A
>
afile
hg add afile
hg add afile
hg ci
-m
"origin"
echo
B
>
afile
...
...
@@ -27,7 +27,7 @@
echo
C
>
afile
hg ci
-m
"A->C"
hg merge
-r1
hg merge
-r1
|
sed
's/-C ./-C/'
|
grep
-v
'merging afile'
# resolve using second parent
echo
B
>
afile
hg resolve
-m
afile
...
...
This diff is collapsed.
Click to expand it.
tests/test-conflict-2.out
+
1
−
2
View file @
3a58fe45
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging afile
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
...
...
@@ -4,7 +3,7 @@
warning: conflicts during merge.
merging afile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C
.
' to abandon
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
@ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test
|\ merge to B
| |
...
...
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