test-update-reverse.out
58 lines
| 1.3 KiB
| text/plain
|
TextLexer
/ tests / test-update-reverse.out
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r1236 | Main should be gone | ||
a | ||||
|
r6336 | created new head | ||
|
r12156 | changeset: 3:91ebc10ed028 | ||
|
r1236 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1236 | summary: Added side2 | ||
|
r12156 | changeset: 2:b932d7dbb1e1 | ||
parent: 0:c2eda428b523 | ||||
|
r1236 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1236 | summary: Added side1 | ||
|
r12156 | changeset: 1:71a760306caf | ||
|
r1236 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1236 | summary: Added main | ||
|
r12156 | changeset: 0:c2eda428b523 | ||
|
r1236 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1236 | summary: Added a | ||
Should have two heads, side2 and main | ||||
|
r12156 | changeset: 3:91ebc10ed028 | ||
|
r1236 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1236 | summary: Added side2 | ||
|
r12156 | changeset: 1:71a760306caf | ||
|
r1236 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1236 | summary: Added main | ||
Should show a side1 side2 | ||||
a | ||||
side1 | ||||
side2 | ||||
resolving manifests | ||||
|
r3314 | overwrite True partial False | ||
|
r12156 | ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf | ||
|
r8734 | side2: other deleted -> r | ||
side1: other deleted -> r | ||||
|
r3121 | main: remote created -> g | ||
|
r11716 | updating: side1 1/3 files (33.33%) | ||
|
r1236 | removing side1 | ||
|
r11716 | updating: side2 2/3 files (66.67%) | ||
|
r1236 | removing side2 | ||
|
r11716 | updating: main 3/3 files (100.00%) | ||
|
r6805 | getting main | ||
|
r1922 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
|
r1236 | Should only show a main | ||
a | ||||
main | ||||