2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2005-09-14 03:38:27 +04:00
|
|
|
Main should be gone
|
|
|
|
a
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 3:ded32b0db104
|
2005-09-14 03:38:27 +04:00
|
|
|
tag: tip
|
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-09-14 03:38:27 +04:00
|
|
|
summary: Added side2
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 2:92a816cea698
|
|
|
|
parent: 0:537353581d3d
|
2005-09-14 03:38:27 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-09-14 03:38:27 +04:00
|
|
|
summary: Added side1
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:221226fb2bd8
|
2005-09-14 03:38:27 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-09-14 03:38:27 +04:00
|
|
|
summary: Added main
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 0:537353581d3d
|
2005-09-14 03:38:27 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-09-14 03:38:27 +04:00
|
|
|
summary: Added a
|
|
|
|
|
|
|
|
Should have two heads, side2 and main
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 3:ded32b0db104
|
2005-09-14 03:38:27 +04:00
|
|
|
tag: tip
|
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-09-14 03:38:27 +04:00
|
|
|
summary: Added side2
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:221226fb2bd8
|
2005-09-14 03:38:27 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-09-14 03:38:27 +04:00
|
|
|
summary: Added main
|
|
|
|
|
|
|
|
Should show a side1 side2
|
|
|
|
a
|
|
|
|
side1
|
|
|
|
side2
|
|
|
|
resolving manifests
|
2006-10-10 11:15:20 +04:00
|
|
|
overwrite True partial False
|
2009-06-09 03:14:44 +04:00
|
|
|
ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8
|
2009-06-09 03:14:44 +04:00
|
|
|
side2: other deleted -> r
|
|
|
|
side1: other deleted -> r
|
2006-09-18 06:27:30 +04:00
|
|
|
main: remote created -> g
|
2005-09-14 03:38:27 +04:00
|
|
|
removing side1
|
|
|
|
removing side2
|
2008-07-01 20:59:31 +04:00
|
|
|
getting main
|
2006-03-13 10:56:59 +03:00
|
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
2005-09-14 03:38:27 +04:00
|
|
|
Should only show a main
|
|
|
|
a
|
|
|
|
main
|