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

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

merge: simplify file revision comparison logic
merge: simplify file revision comparison logic
Matt Mackall - - Load All Authors

File last commit:

r8734:60fa3371 default
r8752:f177bdab default
Show More
test-update-reverse.out
55 lines | 1.2 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
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 537353581d3d 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