view tests/test-update-reverse.out @ 6369:53912d30ac40

Avoid calling heads() twice on every hg commit. In an extreme case (merging two revisions with very low revision numbers) this could be slower than the previous code, but it should be much faster in the usual cases (parents are near the tip). It also avoids some races in some uninteresting cases (e.g. two concurrent hg commits).
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 23 Mar 2008 21:03:24 -0300
parents 4b0c9c674707
children 482581431dcd
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 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