[Bug 4423] New: transplant errors when the resolved merge is empty

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4423

          Priority: normal
            Bug ID: 4423
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: transplant errors when the resolved merge is empty
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: rbtcollins at hp.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.2-rc
         Component: transplant
           Product: Mercurial

I am doing a transplant of commits where for some of them the resolution is to
get rid of the changes entirely.

When this is done via a filter, the commit is skipped.

When this is done manually (e.g. the ones the filter cannot decide on), I get:

$ hg st
? .eggs/README.txt
? .eggs/argparse-1.2.1-py2.6.egg
? NEWS~
? utils/transplant-filter.sh

$ hg transplant -v -s ../cpython.hg --filter utils/transplant-filter.sh
0f1619e539fb: --continue
searching for changes
sampling from both directions
warning: repository is unrelated
abort: commit failed

I would have expected this to have skipped over the commit rather than try to
commit an empty changeset.

-- 
You are receiving this mail because:
You are on the CC list for the bug.