Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-incoming-outgoing.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 | 08ae451148b2 |
children | e3a0c092b4e2 |
line wrap: on
line source
adding foo checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 9 changesets, 9 total revisions comparing with http://localhost:20059/ changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 changeset: 1:d717f5dfad6a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 changeset: 2:c0d6b86da426 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 3:dfacbd43b3fe user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 changeset: 4:1f3a964b6022 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 changeset: 5:c028bcc7a28a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 5 changeset: 6:a0c0095f3389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 6 changeset: 7:d4be65f4e891 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 7 changeset: 8:92b83e334ef8 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 comparing with http://localhost:20059/ changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 changeset: 1:d717f5dfad6a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 changeset: 2:c0d6b86da426 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 3:dfacbd43b3fe user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 changeset: 4:1f3a964b6022 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 comparing with test changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 changeset: 1:d717f5dfad6a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 changeset: 2:c0d6b86da426 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 3:dfacbd43b3fe user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 changeset: 4:1f3a964b6022 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 changeset: 5:c028bcc7a28a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 5 changeset: 6:a0c0095f3389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 6 changeset: 7:d4be65f4e891 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 7 changeset: 8:92b83e334ef8 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 comparing with test changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 changeset: 1:d717f5dfad6a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 changeset: 2:c0d6b86da426 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 3:dfacbd43b3fe user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 changeset: 4:1f3a964b6022 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 comparing with http://localhost:20059/ changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 changeset: 1:d717f5dfad6a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 changeset: 2:c0d6b86da426 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 3:dfacbd43b3fe user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 changeset: 4:1f3a964b6022 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 changeset: 5:c028bcc7a28a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 5 changeset: 6:a0c0095f3389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 6 changeset: 7:d4be65f4e891 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 7 changeset: 8:92b83e334ef8 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 comparing with test changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 changeset: 1:d717f5dfad6a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 changeset: 2:c0d6b86da426 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 changeset: 3:dfacbd43b3fe user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 3 changeset: 4:1f3a964b6022 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 changeset: 5:c028bcc7a28a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 5 changeset: 6:a0c0095f3389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 6 changeset: 7:d4be65f4e891 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 7 changeset: 8:92b83e334ef8 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 adding changesets adding manifests adding file changes added 9 changesets with 9 changes to 1 files (run 'hg update' to get a working copy) adding changesets adding manifests adding file changes added 9 changesets with 9 changes to 1 files (run 'hg update' to get a working copy) changeset: 8:92b83e334ef8 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 changeset: 8:92b83e334ef8 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 14 changesets, 14 total revisions comparing with test searching for changes changeset: 9:3741c3ad1096 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 9 changeset: 10:de4143c8d9a5 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 10 changeset: 11:0e1c188b9a7a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 11 changeset: 12:251354d0fdd3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 12 changeset: 13:bdaadd969642 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 13 comparing with http://localhost:20059/ searching for changes changeset: 9:3741c3ad1096 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 9 changeset: 10:de4143c8d9a5 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 10 changeset: 11:0e1c188b9a7a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 11 changeset: 12:251354d0fdd3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 12 changeset: 13:bdaadd969642 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 13 comparing with http://localhost:20059/ searching for changes changeset: 9:3741c3ad1096 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 9 changeset: 10:de4143c8d9a5 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 10 changeset: 11:0e1c188b9a7a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 11