Mercurial > hg
comparison tests/test-copies-chain-merge.t @ 46536:19f490690880
test-copies: improve description of the A+E case
This will make its role clearer.
Differential Revision: https://phab.mercurial-scm.org/D10040
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 16 Feb 2021 05:35:18 +0100 |
parents | 9a58f9eed303 |
children | 1e96fdcc8bc1 |
comparison
equal
deleted
inserted
replaced
46535:9a58f9eed303 | 46536:19f490690880 |
---|---|
313 -------------------------------------------- | 313 -------------------------------------------- |
314 | 314 |
315 - the "e-" branch renaming b to f (through 'g') | 315 - the "e-" branch renaming b to f (through 'g') |
316 - the "a-" branch renaming d to f (through e) | 316 - the "a-" branch renaming d to f (through e) |
317 | 317 |
318 $ case_desc="simple merge" | 318 $ case_desc="merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)" |
319 | 319 |
320 $ hg up 'desc("a-2")' | 320 $ hg up 'desc("a-2")' |
321 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 321 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
322 $ hg merge 'desc("e-2")' | 322 $ hg merge 'desc("e-2")' |
323 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | 323 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
332 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | 332 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
333 (branch merge, don't forget to commit) | 333 (branch merge, don't forget to commit) |
334 $ hg ci -m "mEAm-0 $case_desc - the other way" | 334 $ hg ci -m "mEAm-0 $case_desc - the other way" |
335 created new head | 335 created new head |
336 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | 336 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
337 @ 20 mEAm-0 simple merge - the other way | 337 @ 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 |\ | 338 |\ |
339 +---o 19 mAEm-0 simple merge - one way | 339 +---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 |
340 | |/ | 340 | |/ |
341 | o 10 e-2 g -move-> f | 341 | o 10 e-2 g -move-> f |
342 | | | 342 | | |
343 | o 9 e-1 b -move-> g | 343 | o 9 e-1 b -move-> g |
344 | | | 344 | | |
681 h-1: b -(move)-> d | 681 h-1: b -(move)-> d |
682 i-0 initial commit: a b h | 682 i-0 initial commit: a b h |
683 i-1: a -move-> c | 683 i-1: a -move-> c |
684 i-2: c -move-> d | 684 i-2: c -move-> d |
685 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | 685 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
686 mAEm-0 simple merge - one way | 686 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 |
687 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | 687 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
688 mBC-revert-m-0 | 688 mBC-revert-m-0 |
689 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | 689 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
690 mBCm-1 re-add d | 690 mBCm-1 re-add d |
691 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way | 691 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
695 mCBm-1 re-add d | 695 mCBm-1 re-add d |
696 mCGm-0 | 696 mCGm-0 |
697 mCH-delete-before-conflict-m-0 | 697 mCH-delete-before-conflict-m-0 |
698 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way | 698 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
699 mDGm-0 simple merge - one way | 699 mDGm-0 simple merge - one way |
700 mEAm-0 simple merge - the other way | 700 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 |
701 mFBm-0 simple merge - the other way | 701 mFBm-0 simple merge - the other way |
702 mFGm-0 simple merge - one way | 702 mFGm-0 simple merge - one way |
703 mGCm-0 | 703 mGCm-0 |
704 mGDm-0 simple merge - the other way | 704 mGDm-0 simple merge - the other way |
705 mGFm-0 simple merge - the other way | 705 mGFm-0 simple merge - the other way |
1186 | 1186 |
1187 - the "e-" branch renaming b to f (through 'g') | 1187 - the "e-" branch renaming b to f (through 'g') |
1188 - the "a-" branch renaming d to f (through e) | 1188 - the "a-" branch renaming d to f (through e) |
1189 | 1189 |
1190 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | 1190 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
1191 o 20 mEAm-0 simple merge - the other way | 1191 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 |\ | 1192 |\ |
1193 +---o 19 mAEm-0 simple merge - one way | 1193 +---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 |
1194 | |/ | 1194 | |/ |
1195 | o 10 e-2 g -move-> f | 1195 | o 10 e-2 g -move-> f |
1196 | | | 1196 | | |
1197 | o 9 e-1 b -move-> g | 1197 | o 9 e-1 b -move-> g |
1198 | | | 1198 | | |