view tests/test-update-reverse.out @ 3116:40e777bda455

merge: remove linear variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:13:02 -0500
parents 92a0c2200e41
children 2ef0b3aae186
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Main should be gone
a
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 branchmerge False partial False
 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d
remote deleted side2, clobbering
remote deleted side1, clobbering
remote created main
getting main
removing side1
removing side2
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Should only show a main
a
main