|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
Main should be gone
|
|
|
a
|
|
|
created new head
|
|
|
changeset: 3:ded32b0db104
|
|
|
tag: tip
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: Added side2
|
|
|
|
|
|
changeset: 2:92a816cea698
|
|
|
parent: 0:537353581d3d
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: Added side1
|
|
|
|
|
|
changeset: 1:221226fb2bd8
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: Added main
|
|
|
|
|
|
changeset: 0:537353581d3d
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: Added a
|
|
|
|
|
|
Should have two heads, side2 and main
|
|
|
changeset: 3:ded32b0db104
|
|
|
tag: tip
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: Added side2
|
|
|
|
|
|
changeset: 1:221226fb2bd8
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: Added main
|
|
|
|
|
|
Should show a side1 side2
|
|
|
a
|
|
|
side1
|
|
|
side2
|
|
|
resolving manifests
|
|
|
overwrite True partial False
|
|
|
ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8
|
|
|
side2: other deleted -> r
|
|
|
side1: other deleted -> r
|
|
|
main: remote created -> g
|
|
|
updating: side1 1/3 files (33.33%)
|
|
|
removing side1
|
|
|
updating: side2 2/3 files (66.67%)
|
|
|
removing side2
|
|
|
updating: main 3/3 files (100.00%)
|
|
|
getting main
|
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
Should only show a main
|
|
|
a
|
|
|
main
|
|
|
|
