test-double-merge.t
65 lines
| 1.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-double-merge.t
|
r11973 | $ hg init repo | ||
$ cd repo | ||||
$ echo line 1 > foo | ||||
|
r12156 | $ hg ci -qAm 'add foo' | ||
|
r11973 | |||
copy foo to bar and change both files | ||||
$ hg cp foo bar | ||||
$ echo line 2-1 >> foo | ||||
$ echo line 2-2 >> bar | ||||
|
r12156 | $ hg ci -m 'cp foo bar; change both' | ||
|
r11973 | |||
in another branch, change foo in a way that doesn't conflict with | ||||
the other changes | ||||
$ hg up -qC 0 | ||||
$ echo line 0 > foo | ||||
$ hg cat foo >> foo | ||||
|
r12156 | $ hg ci -m 'change foo' | ||
|
r11973 | created new head | ||
we get conflicts that shouldn't be there | ||||
$ hg merge -P | ||||
|
r12156 | changeset: 1:484bf6903104 | ||
|
r11973 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11973 | summary: cp foo bar; change both | ||
$ hg merge --debug | ||||
searching for copies back to rev 1 | ||||
unmatched files in other: | ||||
bar | ||||
|
r16795 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||
|
r18135 | src: 'foo' -> dst: 'bar' * | ||
|
r11973 | checking for directory renames | ||
resolving manifests | ||||
|
r18605 | branchmerge: True, force: False, partial: False | ||
|
r15625 | ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 | ||
|
r21391 | preserving foo for resolve of bar | ||
preserving foo for resolve of foo | ||||
|
r20945 | bar: remote copied from foo -> m | ||
|
r26517 | picked tool ':merge' for bar (binary False symlink False) | ||
|
r11973 | merging foo and bar to bar | ||
|
r12156 | my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc | ||
|
r11973 | premerge successful | ||
|
r21391 | foo: versions differ -> m | ||
|
r26517 | picked tool ':merge' for foo (binary False symlink False) | ||
|
r11973 | merging foo | ||
|
r12156 | my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc | ||
|
r11973 | premerge successful | ||
0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
contents of foo | ||||
$ cat foo | ||||
line 0 | ||||
line 1 | ||||
line 2-1 | ||||
contents of bar | ||||
$ cat bar | ||||
line 0 | ||||
line 1 | ||||
line 2-2 | ||||
|
r16913 | |||
$ cd .. | ||||