D4381: cmdutil: fix typo in revert()

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4381 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py b/mercuri

D4380: revert: fix the inconsistency of status msgs in --interactive mode

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch we were priting every action msg before actually performing that action and that would result in inconsistencies like if user decided to not

D4379: resolve: add config to make hg resolve not re-merge by default

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this, calling 'hg resolve' with neither -m, -u or -l will re-merge. This is highly error prone (it's easy to forget to forget a -m), and pret

D4378: resolve: add a flag for the default behavior of re-merging

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On its own, it's not useful, but the next commit will add an hgrc config option to make it mandatory. There is no short option, as -r almost alwa

D4377: resolve: make condition clearer, and able to handle a new flag

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4377 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands

[Bug 5971] New: bogus "repository changed while pushing" error

https://bz.mercurial-scm.org/show_bug.cgi?id=5971 Bug ID: 5971 Summary: bogus "repository changed while pushing" error Product: Mercurial Version: 3.7.3 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

D4376: pager: do not enable when TERM=dumb

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this, running hg in emacs' M-x shell started `less`, which would complain about the terminal not being fully functional. REPOSITORY rHG Merc

D4375: filemerge: fix the wrong placements of messages in prompt

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Mistakenly, the local-changed-other-deleted-message was put in other-change-local-deleted and vice versa. This followups on https://phab.mercurial-scm.org/D4336.