Mercurial > hg
view tests/test-bundle.out @ 4744:44e17f5029d0
Make hg add foo; hg mv foo bar work.
- foo will be removed (the user has a copy of its contents in bar)
- bar will not be marked as a copy (there was no committed version of foo).
We print a warning telling that to the user.
Fixes issue269.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 03 Jul 2007 03:06:40 -0300 |
parents | a6b62584d0b2 |
children | 99fdef2e6793 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions searching for changes adding changesets adding manifests adding file changes added 0 changesets with 0 changes to 4 files (run 'hg update' to get a working copy) changeset: -1:000000000000 tag: tip user: date: Thu Jan 01 00:00:00 1970 +0000 checking changesets checking manifests crosschecking files in changesets and manifests checking files 0 files, 0 changesets, 0 total revisions pulling from ../full.hg searching for changes no changes found pulling from ../full.hg requesting all changes adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) rolling back last transaction pulling from ../full.hg requesting all changes adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3 changeset: 2:d62976ca1e50 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.2 changeset: 1:10b2180f755b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.1 changeset: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg pulling from bundle://../full.hg requesting all changes adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3 changeset: 2:d62976ca1e50 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.2 changeset: 1:10b2180f755b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.1 changeset: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 comparing with bundle://../full.hg searching for changes changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m comparing with ../partial2 searching for changes changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m abort: No such file or directory: ../does-not-exist.hg adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes comparing with ../bundle.hg searching for changes changeset: 2:ed1b79f46b9a tag: tip parent: 0:bbd179dfa0a7 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change foo