Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-update-reverse.out @ 3299:a1aad25ccc3e
fix localrepo.status when dealing with x-bit changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 10 Oct 2006 00:02:30 +0200 |
parents | 2ef0b3aae186 |
children | b16456909a0a |
line wrap: on
line source
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 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d 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