Mercurial > hg

view tests/test-update-reverse.out @ 9442:080227f584a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeroconf: fix hgweb published URLs (issue1819)
author Patrick Mezard <pmezard@gmail.com>
date Sun, 13 Sep 2009 17:23:47 +0200
parents af5f099d932b
children ba5e508b5e92
line wrap: on
line source

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
removing side1
removing side2
getting main
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Should only show a main
a
main