[Bug 4697] New: 'hg import' should try at least as hard as 'patch --merge'

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Sat May 30 15:09:16 CDT 2015


          Priority: normal
            Bug ID: 4697
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: 'hg import' should try at least as hard as 'patch
          Severity: feature
    Classification: Unclassified
                OS: All
          Reporter: zeratul976 at hotmail.com
          Hardware: All
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

There are times when I need to import patches into a repository, and they don't
apply perfectly cleanly, and 'hg import' fails to merge them, but 'patch
--merge' merges them fine.

Using 'patch --merge', however, is annoying, because then you need to commit
manually as a second step.

It would be great if 'hg import' would try to use the same merge algorithm that
'patch --merge' does.

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

More information about the Mercurial-devel mailing list