convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.

     1

adding bar

     2

adding foo

     3

adding quux1

     4

adding quux2

     5

merging bar

     6

merging bar failed!

     7

merging foo and baz

     8

merging baz failed!

     9

1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    10

There are unresolved merges, you can redo the full merge using:

    11

  hg update -C 2

    12

  hg merge 1

    13

3 files updated, 0 files merged, 1 files removed, 0 files unresolved

    14

merging bar

    15

merging bar failed!

    16

merging baz and foo

    17

merging baz failed!

    18

1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    19

There are unresolved merges, you can redo the full merge using:

    20

  hg update -C 1

    21

  hg merge 2