annotate tests/test-bad-pull.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 5eb02f9ed804
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 705
diff changeset
1 abort: error: Connection refused
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset
2 255
1962
2a676ad52c22 tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents: 925
diff changeset
3 copy: No such file or directory
2438
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2108
diff changeset
4 abort: HTTP Error 404
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2108
diff changeset
5 0