##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

make test-mq-qdiff executable.
make test-mq-qdiff executable.
Matt Mackall - - Load All Authors

File last commit:

r2830:49988d9f merge default
r2917:143cd235 default
Show More
test-update-reverse.out
54 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-update-reverse.out
History | Annotation | Raw |Copy content |Copy permalink
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 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
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Should only show a main
a
main