Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-update-reverse.out @ 1877:d314a89fa4f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change lock format to let us detect and break stale locks. old style: symlink to pid new style: symlink to hostname:pid if lock code finds new-style lock, it breaks lock if locking pid is on same machine and pid is not alive. otherwise, lock is left alone. this makes locking code safe with old-style locks and with locks on other machines. new code makes server part of mercurial more robust in case machine crashes, power fails, or crazy user does kill -9.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 10 Mar 2006 08:31:31 -0800
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