Mercurial > hg

view tests/test-update-reverse.out @ 1713:03ee100b8c21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hooks: distinguish between locally committed and incoming changes. "commit" hook is now for locally committed changes only. "incoming" is for changes pulled, pushed, or unbundled into local repo.
author Daniel Santa Cruz <byteshack@gmail.com>
date Fri, 10 Feb 2006 16:45:56 -0500
parents 3a0b69ea5708
children 6d50d6189269
line wrap: on
line source

Main should be gone
a
changeset:   3:91ebc10ed028
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Added side2

changeset:   2:b932d7dbb1e1
parent:      0:c2eda428b523
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Added side1

changeset:   1:71a760306caf
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Added main

changeset:   0:c2eda428b523
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Added a

Should have two heads, side2 and main
changeset:   3:91ebc10ed028
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Added side2

changeset:   1:71a760306caf
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Added main

Should show a side1 side2
a
side1
side2
resolving manifests
 force 1 allow None moddirstate True linear False
 ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
remote deleted side2, clobbering
remote deleted side1, clobbering
remote created main
getting main
removing side1
removing side2
Should only show a main
a
main