Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
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
Environments
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
mercurial-devel
Commits
8183e4f455b2
Commit
8183e4f455b2
authored
4 years ago
by
Pierre-Yves David
Browse files
Options
Downloads
Patches
Plain Diff
test-copies: improve description of the A+E case
This will make its role clearer.
parent
e65760c670f8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-copies-chain-merge.t
+7
-7
7 additions, 7 deletions
tests/test-copies-chain-merge.t
with
7 additions
and
7 deletions
tests/test-copies-chain-merge.t
+
7
−
7
View file @
8183e4f4
...
...
@@ -315,7 +315,7 @@
- the "e-" branch renaming b to f (through
'
g
'
)
- the "a-" branch renaming d to f (through e)
$ case_desc="
simple merge
"
$ case_desc="
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
"
$ hg up
'
desc
("
a-2
")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
...
...
@@ -334,5 +334,5 @@
$ hg ci -m "mEAm-0 $case_desc - the other way"
created new head
$ hg log -G --rev
'
::
(
desc
("
mAEm
")
+
desc
("
mEAm
"))'
@ 20 mEAm-0
simple merge
- the other way
@ 20 mEAm-0
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
- the other way
|\
...
...
@@ -338,5 +338,5 @@
|\
+---o 19 mAEm-0
simple merge
- one way
+---o 19 mAEm-0
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
- one way
| |/
| o 10 e-2 g -move-> f
| |
...
...
@@ -683,7 +683,7 @@
i-1: a -move-> c
i-2: c -move-> d
mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
mAEm-0
simple merge
- one way
mAEm-0
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
- one way
mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
mBC-revert-m-0
mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
...
...
@@ -697,7 +697,7 @@
mCH-delete-before-conflict-m-0
mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
mDGm-0 simple merge - one way
mEAm-0
simple merge
- the other way
mEAm-0
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
- the other way
mFBm-0 simple merge - the other way
mFGm-0 simple merge - one way
mGCm-0
...
...
@@ -1188,5 +1188,5 @@
- the "a-" branch renaming d to f (through e)
$ hg log -G --rev
'
::
(
desc
("
mAEm
")
+
desc
("
mEAm
"))'
o 20 mEAm-0
simple merge
- the other way
o 20 mEAm-0
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
- the other way
|\
...
...
@@ -1192,5 +1192,5 @@
|\
+---o 19 mAEm-0
simple merge
- one way
+---o 19 mAEm-0
merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)
- one way
| |/
| o 10 e-2 g -move-> f
| |
...
...
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