This is an archive of the discontinued Mercurial Phabricator instance.

status: disable morestatus when using -0

Authored by martinvonz on Dec 8 2020, 4:39 PM.



Without this patch, you get something like this:

M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc)

# Unresolved merge conflicts:
#     a
# To mark files as resolved:  hg resolve --mark FILE

# To continue:    hg commit
# To abort:       hg merge --abort

That doesn't seem like something one would ever want. I considered
making it an error to combine -0 with morestatus, but it seems very
likely that that would just make the user spend time trying to figure
out how to disable morestatus, so it feels like we might as well just
do it for them.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 8 2020, 4:39 PM
mharbison72 accepted this revision.Dec 8 2020, 10:10 PM
This revision is now accepted and ready to land.Dec 8 2020, 10:10 PM
This revision was automatically updated to reflect the committed changes.