[Bug 4792] New: Commit messages for collapsed rebases are not saved if there is a conflict

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 4792
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Commit messages for collapsed rebases are not saved if
                    there is a conflict
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: nathan12343 at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.5
         Component: rebase
           Product: Mercurial

I'm backporting changes using the rebase command. Here is an example command
invocation:

hg rebase -r f1603dc32d14::26057aaf318f --keep --collapse -m "Backporting PR
#1707 https://bitbucket.org/yt_analysis/yt/pull-requests/1707" -d 80cc7388b5d6

In cases where the rebase triggers a merge conflict, the commit message
specified by the "-m" flag is not saved. Instead, after invoking "hg rebase
--continue", my editor opens and I'm prompted to review the automatically
generated commit message based on the collapsed changesets.

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