test-rename-merge1.out
29 lines
| 873 B
| text/plain
|
TextLexer
/ tests / test-rename-merge1.out
Matt Mackall
|
r3153 | checkout | ||
| 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
| merge | ||||
| resolving manifests | ||||
|
Matt Mackall
|
r3314 | overwrite None partial False | ||
| ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 | ||||
|
Matt Mackall
|
r4674 | a2: divergent renames -> dr | ||
|
Matt Mackall
|
r3727 | a: remote moved to b -> m | ||
|
Matt Mackall
|
r3153 | b2: remote created -> g | ||
|
Matt Mackall
|
r5042 | copying a to b | ||
|
Matt Mackall
|
r3311 | merging a and b | ||
|
Matt Mackall
|
r3314 | my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c | ||
|
Matt Mackall
|
r3251 | removing a | ||
|
Matt Mackall
|
r4674 | warning: detected divergent renames of a2 to: | ||
| c2 | ||||
| b2 | ||||
|
Matt Mackall
|
r3153 | getting b2 | ||
|
Matt Mackall
|
r3251 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
Matt Mackall
|
r3153 | (branch merge, don't forget to commit) | ||
|
Matt Mackall
|
r3251 | M b | ||
| a | ||||
| M b2 | ||||
| R a | ||||
| C c2 | ||||
|
Matt Mackall
|
r3153 | blahblah | ||
|
Matt Mackall
|
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 | ||||
|
Matt Mackall
|
r3652 | b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 | ||