test-double-merge.out
42 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-double-merge.out
Dirkjan Ochtman
|
r6336 | created new head | ||
|
Dirkjan Ochtman
|
r8387 | changeset: 0:310fd17130da | ||
| user: test | ||||
| date: Mon Jan 12 13:46:40 1970 +0000 | ||||
| summary: add foo | ||||
| changeset: 1:7731dad1c2b9 | ||||
| user: test | ||||
| date: Mon Jan 12 13:46:40 1970 +0000 | ||||
| summary: cp foo bar; change both | ||||
Matt Mackall
|
r5042 | resolving manifests | ||
| overwrite None partial False | ||||
| ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 | ||||
|
Matt Mackall
|
r5371 | searching for copies back to rev 1 | ||
| unmatched files in other: | ||||
| bar | ||||
| all copies found (* = to merge, ! = divergent): | ||||
| bar -> foo * | ||||
| checking for directory renames | ||||
|
Matt Mackall
|
r5042 | foo: versions differ -> m | ||
| foo: remote copied to bar -> m | ||||
|
Matt Mackall
|
r6512 | preserving foo for resolve of bar | ||
| preserving foo for resolve of foo | ||||
| picked tool 'internal:merge' for bar (binary False symlink False) | ||||
| merging foo and bar to bar | ||||
| my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da | ||||
|
Matt Mackall
|
r6004 | premerge successful | ||
| picked tool 'internal:merge' for foo (binary False symlink False) | ||||
|
Matt Mackall
|
r5042 | merging foo | ||
| my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da | ||||
|
Matt Mackall
|
r6004 | premerge successful | ||
|
Matt Mackall
|
r5042 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
| -- foo -- | ||||
| line 0 | ||||
| line 1 | ||||
| line 2-1 | ||||
| -- bar -- | ||||
| line 0 | ||||
| line 1 | ||||
| line 2-2 | ||||