Mercurial > hg-stable

comparison tests/test-copies-chain-merge.t @ 46580:e20977208924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-copies: improve description of the A+B case This will make its role clearer. Differential Revision: https://phab.mercurial-scm.org/D10037
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Feb 2021 05:26:46 +0100
parents c9f502721783
children 979838adc46b
comparison
equal deleted inserted replaced
46579:c9f502721783 46580:e20977208924
183 --------------------------------------------------------------- 183 ---------------------------------------------------------------
184 184
185 - rename on one side 185 - rename on one side
186 - unrelated change on the other side 186 - unrelated change on the other side
187 187
188 $ case_desc="simple merge" 188 $ case_desc="simple merge - A side: multiple renames, B side: unrelated update"
189 189
190 $ hg up 'desc("b-1")' 190 $ hg up 'desc("b-1")'
191 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 191 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
192 $ hg merge 'desc("a-2")' 192 $ hg merge 'desc("a-2")'
193 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 193 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
199 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 199 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
200 (branch merge, don't forget to commit) 200 (branch merge, don't forget to commit)
201 $ hg ci -m "mABm-0 $case_desc - the other way" 201 $ hg ci -m "mABm-0 $case_desc - the other way"
202 created new head 202 created new head
203 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' 203 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
204 @ 12 mABm-0 simple merge - the other way 204 @ 12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
205 |\ 205 |\
206 +---o 11 mBAm-0 simple merge - one way 206 +---o 11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
207 | |/ 207 | |/
208 | o 5 b-1: b update 208 | o 5 b-1: b update
209 | | 209 | |
210 o | 4 a-2: e -move-> f 210 o | 4 a-2: e -move-> f
211 | | 211 | |
680 g-1: update d 680 g-1: update d
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 - 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 simple merge - one way
687 mBAm-0 simple merge - 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 - one way 689 mBCm-0 simple merge - one way
690 mBCm-1 re-add d 690 mBCm-1 re-add d
691 mBDm-0 simple merge - one way 691 mBDm-0 simple merge - one way
692 mBFm-0 simple merge - one way 692 mBFm-0 simple merge - one way
971 971
972 - rename on one side 972 - rename on one side
973 - unrelated change on the other side 973 - unrelated change on the other side
974 974
975 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' 975 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
976 o 12 mABm-0 simple merge - the other way 976 o 12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
977 |\ 977 |\
978 +---o 11 mBAm-0 simple merge - one way 978 +---o 11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
979 | |/ 979 | |/
980 | o 5 b-1: b update 980 | o 5 b-1: b update
981 | | 981 | |
982 o | 4 a-2: e -move-> f 982 o | 4 a-2: e -move-> f
983 | | 983 | |