test-rename-merge1.out
42 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-rename-merge1.out
|
r3153 | checkout | ||
2 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
merge | ||||
resolving manifests | ||||
|
r3314 | overwrite None partial False | ||
ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 | ||||
|
r5371 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
c2 | ||||
unmatched files in other: | ||||
b | ||||
b2 | ||||
all copies found (* = to merge, ! = divergent): | ||||
|
r5857 | c2 -> a2 ! | ||
|
r5371 | b -> a * | ||
|
r5857 | b2 -> a2 ! | ||
|
r5371 | checking for directory renames | ||
|
r4674 | a2: divergent renames -> dr | ||
|
r3727 | a: remote moved to b -> m | ||
|
r3153 | b2: remote created -> g | ||
|
r5042 | copying a to b | ||
|
r6004 | picked tool 'internal:merge' for a (binary False symlink False) | ||
|
r3311 | merging a and b | ||
|
r3314 | my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c | ||
|
r6004 | premerge successful | ||
|
r3251 | removing a | ||
|
r4674 | warning: detected divergent renames of a2 to: | ||
c2 | ||||
b2 | ||||
|
r3153 | getting b2 | ||
|
r3251 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r3153 | (branch merge, don't forget to commit) | ||
|
r3251 | M b | ||
a | ||||
M b2 | ||||
R a | ||||
|
r5764 | C c2 | ||
|
r3153 | blahblah | ||
|
r3292 | rev offset length base linkrev nodeid p1 p2 | ||
0 0 67 0 1 dc51707dfc98 000000000000 000000000000 | ||||
1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98 | ||||
|
r3652 | b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 | ||