test-issue672.t
99 lines
| 2.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-issue672.t
|
r26420 | https://bz.mercurial-scm.org/672 | ||
|
r12195 | |||
# 0-2-4 | ||||
# \ \ \ | ||||
# 1-3-5 | ||||
# | ||||
# rename in #1, content change in #4. | ||||
$ hg init | ||||
$ touch 1 | ||||
$ touch 2 | ||||
$ hg commit -Am init # 0 | ||||
adding 1 | ||||
adding 2 | ||||
$ hg rename 1 1a | ||||
$ hg commit -m rename # 1 | ||||
$ hg co -C 0 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo unrelated >> 2 | ||||
$ hg ci -m unrelated1 # 2 | ||||
created new head | ||||
$ hg merge --debug 1 | ||||
unmatched files in other: | ||||
1a | ||||
|
r16795 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||
|
r44679 | on remote side: | ||
src: '1' -> dst: '1a' | ||||
|
r12195 | checking for directory renames | ||
resolving manifests | ||||
|
r18605 | branchmerge: True, force: False, partial: False | ||
|
r15625 | ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a | ||
|
r12195 | 1: other deleted -> r | ||
|
r18631 | removing 1 | ||
|
r21391 | 1a: remote created -> g | ||
|
r18631 | getting 1a | ||
|
r12195 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
$ hg ci -m merge1 # 3 | ||||
$ hg co -C 2 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo hello >> 1 | ||||
$ hg ci -m unrelated2 # 4 | ||||
created new head | ||||
$ hg co -C 3 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg merge -y --debug 4 | ||||
unmatched files in local: | ||||
1a | ||||
|
r16795 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||
|
r44679 | on local side: | ||
src: '1' -> dst: '1a' * | ||||
|
r12195 | checking for directory renames | ||
resolving manifests | ||||
|
r18605 | branchmerge: True, force: False, partial: False | ||
|
r42840 | ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 | ||
|
r46689 | starting 4 threads for background file closing (?) | ||
|
r21391 | preserving 1a for resolve of 1a | ||
|
r26618 | 1a: local copied/moved from 1 -> m (premerge) | ||
|
r27161 | picked tool ':merge' for 1a (binary False symlink False changedelete False) | ||
|
r12195 | merging 1a and 1 to 1a | ||
|
r42840 | my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9 | ||
|
r12195 | premerge successful | ||
0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg co -C 4 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg merge -y --debug 3 | ||||
unmatched files in other: | ||||
1a | ||||
|
r16795 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||
|
r44679 | on remote side: | ||
src: '1' -> dst: '1a' * | ||||
|
r12195 | checking for directory renames | ||
resolving manifests | ||||
|
r18605 | branchmerge: True, force: False, partial: False | ||
|
r42840 | ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b | ||
|
r46689 | starting 4 threads for background file closing (?) | ||
|
r21391 | preserving 1 for resolve of 1a | ||
removing 1 | ||||
|
r26618 | 1a: remote moved from 1 -> m (premerge) | ||
|
r27161 | picked tool ':merge' for 1a (binary False symlink False changedelete False) | ||
|
r12195 | merging 1 and 1a to 1a | ||
|
r42840 | my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9 | ||
|
r12195 | premerge successful | ||
0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||