[Bug 4894] New: rebase automatically chooses conflict resolutions in noninteractive environments

[mercurial-bugs at selenic.com]

https://bz.mercurial-scm.org/show_bug.cgi?id=4894

            Bug ID: 4894
           Summary: rebase automatically chooses conflict resolutions in
                    noninteractive environments
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: durham at fb.com
                CC: mercurial-devel at selenic.com

hg rebase sometimes prompts the user for 'changed (c) or deleted (d)?'.  In a
noninteractive environment this automatically chooses the first option.

In automation that does rebases and pushes, this can cause unintended files to
be reintroduced in the repository.

I believe the right thing to do in these situations is not-prompt, but instead
mark the files as conflicted and let the user deal with it like any other
conflict.

If that's a backwards compatibility breakage, we could at least have an option
to not allow auto choosing this prompt.

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