Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-flags.out @ 2024:6328445b0e71
Fixes to testpid() for Windows.
Handle processes that no longer exist and processes that belong to another user.
Enables the lock breaking changes from d314a89fa4f1 and subsequently "fixes" the left over locks reported in bug 112.
author | Lee Cantey <lcantey@gmail.com> |
---|---|
date | Thu, 30 Mar 2006 18:20:08 -0800 |
parents | ced2d3620f95 |
children | b2ae81a7df29 |
line wrap: on
line source
pulling from ../test1 requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files (run 'hg update' to get a working copy) pulling from ../test2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) changeset: 2:b833d578451e tag: tip parent: 0:4536b1c2ca69 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: chmod +x a changeset: 1:a187cb361a5a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: a updated changeset: 2:b833d578451e tag: tip parent: 0:4536b1c2ca69 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: chmod +x a changeset: 1:a187cb361a5a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: a updated changeset: 0:4536b1c2ca69 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: added a b resolving manifests merging a resolving a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -rwxr-x--- -rwxr-x---