test-issue672.out
58 lines
| 2.0 KiB
| text/plain
|
TextLexer
/ tests / test-issue672.out
Alexis S. L. Carvalho
|
r5096 | adding 1 | ||
| adding 2 | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Matt Mackall
|
r5371 | searching for copies back to rev 1 | ||
| unmatched files in other: | ||||
| 1a | ||||
| all copies found (* = to merge, ! = divergent): | ||||
| 1a -> 1 | ||||
| checking for directory renames | ||||
|
Matt Mackall
|
r8753 | resolving manifests | ||
| overwrite None partial False | ||||
| ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c | ||||
|
Alexis S. L. Carvalho
|
r5096 | 1: other deleted -> r | ||
| 1a: remote created -> g | ||||
| removing 1 | ||||
| getting 1a | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
Dirkjan Ochtman
|
r6336 | created new head | ||
|
Alexis S. L. Carvalho
|
r5096 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
Matt Mackall
|
r5371 | searching for copies back to rev 1 | ||
| unmatched files in local: | ||||
| 1a | ||||
| all copies found (* = to merge, ! = divergent): | ||||
| 1a -> 1 * | ||||
| checking for directory renames | ||||
|
Matt Mackall
|
r8753 | resolving manifests | ||
| overwrite None partial False | ||||
| ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 | ||||
|
Matt Mackall
|
r8748 | 1a: local copied/moved to 1 -> m | ||
|
Matt Mackall
|
r6512 | preserving 1a for resolve of 1a | ||
|
Matt Mackall
|
r6004 | picked tool 'internal:merge' for 1a (binary False symlink False) | ||
|
Matt Mackall
|
r6512 | merging 1a and 1 to 1a | ||
|
Alexis S. L. Carvalho
|
r5096 | my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d | ||
|
Matt Mackall
|
r6004 | premerge successful | ||
|
Alexis S. L. Carvalho
|
r5096 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
Matt Mackall
|
r5371 | searching for copies back to rev 1 | ||
| unmatched files in other: | ||||
| 1a | ||||
| all copies found (* = to merge, ! = divergent): | ||||
| 1a -> 1 * | ||||
| checking for directory renames | ||||
|
Matt Mackall
|
r8753 | resolving manifests | ||
| overwrite None partial False | ||||
| ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 | ||||
|
Alexis S. L. Carvalho
|
r5096 | 1: remote moved to 1a -> m | ||
|
Matt Mackall
|
r6512 | preserving 1 for resolve of 1a | ||
| removing 1 | ||||
| picked tool 'internal:merge' for 1a (binary False symlink False) | ||||
| merging 1 and 1a to 1a | ||||
| my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d | ||||
|
Matt Mackall
|
r6004 | premerge successful | ||
|
Alexis S. L. Carvalho
|
r5096 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||