This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6755

merge: hint about using `hg resolve` for resolving conflicts
ClosedPublic

Authored by martinvonz on Aug 21 2019, 4:20 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7b80ad5af239: merge: hint about using `hg resolve` for resolving conflicts
Summary

This was suggested by one of our users at Google. Makes sense to me.

Diff Detail

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

Event Timeline

martinvonz created this revision.Aug 21 2019, 4:20 PM
pulkit accepted this revision.Aug 22 2019, 1:21 PM
This revision is now accepted and ready to land.Aug 22 2019, 1:21 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (3 lines)
Mtests/test-rebase-inmemory.t (1 line)
Mtests/test-resolve.t (3 lines)

Diff 16296

mercurial/merge.py

overwrite = force and not branchmerge overwrite = force and not branchmerge
### check phase ### check phase
if not overwrite: if not overwrite:
if len(pl) > 1: if len(pl) > 1:
raise error.Abort(_("outstanding uncommitted merge")) raise error.Abort(_("outstanding uncommitted merge"))
ms = mergestate.read(repo) ms = mergestate.read(repo)
if list(ms.unresolved()): if list(ms.unresolved()):
raise error.Abort(_("outstanding merge conflicts")) raise error.Abort(_("outstanding merge conflicts"),
hint=_("use 'hg resolve' to resolve"))
if branchmerge: if branchmerge:
if pas == [p2]: if pas == [p2]:
raise error.Abort(_("merging with a working directory ancestor" raise error.Abort(_("merging with a working directory ancestor"
" has no effect")) " has no effect"))
elif pas == [p1]: elif pas == [p1]:
if not mergeancestor and wc.branch() == p2.branch(): if not mergeancestor and wc.branch() == p2.branch():
raise error.Abort(_("nothing to merge"), raise error.Abort(_("nothing to merge"),
hint=_("use 'hg update' " hint=_("use 'hg update' "

tests/test-rebase-inmemory.t

2 files updated, 0 files merged, 0 files removed, 1 files unresolved 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg resolve -l $ hg resolve -l
U e U e
$ hg rebase -s 2 -d 7 $ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
abort: outstanding merge conflicts abort: outstanding merge conflicts
(use 'hg resolve' to resolve)
[255] [255]
$ hg resolve -l $ hg resolve -l
U e U e
========================== ==========================
Test for --confirm option| Test for --confirm option|
========================== ==========================
$ cd .. $ cd ..

tests/test-resolve.t

$ hg up 1 $ hg up 1
merging file1 merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
1 files updated, 0 files merged, 0 files removed, 1 files unresolved 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg up 0 $ hg up 0
abort: outstanding merge conflicts abort: outstanding merge conflicts
(use 'hg resolve' to resolve)
[255] [255]
$ hg merge 2 $ hg merge 2
abort: outstanding merge conflicts abort: outstanding merge conflicts
(use 'hg resolve' to resolve)
[255] [255]
$ hg merge --force 2 $ hg merge --force 2
abort: outstanding merge conflicts abort: outstanding merge conflicts
(use 'hg resolve' to resolve)
[255] [255]
set up conflict-free merge set up conflict-free merge
$ hg up -qC 3 $ hg up -qC 3
$ hg merge 1 $ hg merge 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)