Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-bundle.out @ 5192:33015dac5df5
convert: fix mercurial_sink.putcommit
Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a
revision that touches no files, but this can break regular conversions
from some repositories:
- conceptually, since we're converting a repo, we should try to make
the new hg repo as similar as possible to the original repo - we
should create a new changeset, even if the original revision didn't
touch any files (maybe the commit message had some important bit);
- even if a "regular" revision that doesn't touch any file may seem
weird (and maybe even broken), it's completely legitimate for a merge
revision to not touch any file, and, if we just skip it, the
converted repo will end up with wrong history and possibly an extra
head.
As an example, say the crew and main hg repos are sync'ed. Somebody
sends an important patch to the mailing list. Matt quickly applies
and pushes it. But at the same time somebody also applies it to crew
and pushes it. Suppose the commit message ended up being a bit
different (say, there was a typo and somebody didn't fix it) or that
the date ended up being different (because of different patch-applying
scripts): the changeset hashes will be different, but the manifests
will be the same.
Since both changesets were pushed to public repos, it's hard to recall
them. If both are merged, the manifest from the resulting merge
revision will have the exact same contents as its parents - i.e. the
merge revision really doesn't touch any file at all.
To keep the file filtering stuff "working", the generic code was changed
to skip empty revisions if we're filtering the repo, fixing a bug in the
process (we want parents[0] instead of tip).
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 17 Aug 2007 20:18:05 -0300 |
parents | a6b62584d0b2 |
children |
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