Mercurial > hg

view tests/test-update-reverse.out @ 3400:d2b55e3c4e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents b16456909a0a
children 4b0c9c674707
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 partial False
 ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8
 side2: remote deleted -> r
 side1: remote deleted -> r
 main: remote created -> g
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