test-update-reverse.out
54 lines
| 1.2 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 | ||||
|
r1933 | changeset: 3:ded32b0db104 | ||
|
r1236 | tag: tip | ||
user: test | ||||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1236 | summary: Added side2 | ||
|
r1933 | changeset: 2:92a816cea698 | ||
parent: 0:537353581d3d | ||||
|
r1236 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1236 | summary: Added side1 | ||
|
r1933 | changeset: 1:221226fb2bd8 | ||
|
r1236 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1236 | summary: Added main | ||
|
r1933 | changeset: 0:537353581d3d | ||
|
r1236 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1236 | summary: Added a | ||
Should have two heads, side2 and main | ||||
|
r1933 | changeset: 3:ded32b0db104 | ||
|
r1236 | tag: tip | ||
user: test | ||||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1236 | summary: Added side2 | ||
|
r1933 | changeset: 1:221226fb2bd8 | ||
|
r1236 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1236 | summary: Added main | ||
Should show a side1 side2 | ||||
a | ||||
side1 | ||||
side2 | ||||
resolving manifests | ||||
|
r3110 | overwrite True branchmerge False partial False | ||
|
r2979 | ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d | ||
|
r1236 | remote deleted side2, clobbering | ||
remote deleted side1, clobbering | ||||
remote created main | ||||
getting main | ||||
removing side1 | ||||
removing side2 | ||||
|
r1922 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||
|
r1236 | Should only show a main | ||
a | ||||
main | ||||