[Bug 4698] New: rebase's message "tool option will be ignored" is a lie, when multiple changes are being rebased

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Mon Jun 1 02:58:04 UTC 2015


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

          Priority: normal
            Bug ID: 4698
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: rebase's message "tool option will be ignored" is a
                    lie, when multiple changes are being rebased
          Severity: bug
    Classification: Unclassified
                OS: Other
          Reporter: jwdevel at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.4-rc
         Component: rebase
           Product: Mercurial

If you run:

  hg rebase --continue --tool XXX

You will receive the warning "tool option will be ignored".
That is a false statement if there are more changes to be rebased after the
current one.

If you rebase multiple changes, and each one has merge conflicts, you will need
to use "--continue" several times. And since rebase does not remember what
"--tool" you chose originally, you *must*, in fact, use "--tool" along with
"--continue". But you get this spurious warning message.


I can provide repro steps, if my description is not clear enough.

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


More information about the Mercurial-devel mailing list