Mercurial > hg > mercurial-crew-with-dirclash
annotate .hgtags @ 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 | a084ed4b0c35 |
children | 040984468440 |
rev | line source |
---|---|
66 | 1 d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f |
2 1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e | |
3 7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d | |
4 b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c | |
189 | 5 f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5 |
194 | 6 0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b |
458
ff8fbf99cd64
Added tag 0.6 for changeset 12e0fdbc57a0be78f0e817fd1d170a3615cd35da
mpm@selenic.com
parents:
194
diff
changeset
|
7 12e0fdbc57a0be78f0e817fd1d170a3615cd35da 0.6 |
685
79fb7032739f
Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd
Matt Mackall <mpm@selenic.com>
parents:
458
diff
changeset
|
8 4ccf3de52989b14c3d84e1097f59e39a992e00bd 0.6b |
972
0bc72d91aeda
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com
parents:
685
diff
changeset
|
9 eac9c8efcd9bd8244e72fb6821f769f450457a32 0.6c |
1266
703783bc09c4
Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3
mpm@selenic.com
parents:
981
diff
changeset
|
10 979c049974485125e1f9357f6bbe9c1b548a64c3 0.7 |
1666
0fc1b588976f
Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349
Matt Mackall <mpm@selenic.com>
parents:
1266
diff
changeset
|
11 3a56574f329a368d645853e0f9e09472aee62349 0.8 |
2052
c0b945c5df08
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
Matt Mackall <mpm@selenic.com>
parents:
1666
diff
changeset
|
12 6a03cff2b0f5d30281e6addefe96b993582f2eac 0.8.1 |
2252
ba7afc7dd901
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
Matt Mackall <mpm@selenic.com>
parents:
2052
diff
changeset
|
13 35fb62a3a673d5322f6274a44ba6456e5e4b3b37 0.9 |
2659
93b765f30c07
Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9
Matt Mackall <mpm@selenic.com>
parents:
2252
diff
changeset
|
14 2be3001847cb18a23c403439d9e7d0ace30804e9 0.9.1 |
3866
740b2a23c0db
Added tag 0.9.2 for changeset 36a957364b1b
Matt Mackall <mpm@selenic.com>
parents:
2659
diff
changeset
|
15 36a957364b1b89c150f2d0e60a99befe0ee08bd3 0.9.2 |
3926
b27f1da6ca88
Added tag 0.9.3 for changeset 27230c29bfec
Matt Mackall <mpm@selenic.com>
parents:
3866
diff
changeset
|
16 27230c29bfec36d5540fbe1c976810aefecfd1d2 0.9.3 |
4724
a084ed4b0c35
Added tag 0.9.4 for changeset fb4b6d5fe100
Matt Mackall <mpm@selenic.com>
parents:
3926
diff
changeset
|
17 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0.9.4 |