[prev in list] [next in list] [prev in thread] [next in thread]
List: mercurial-devel
Subject: D12111: merge: stop using merge action for pathconflict option
From: "marmoute (Pierre-Yves David)" <phabricator () mercurial-scm ! org>
Date: 2022-01-29 14:15:03
Message-ID: differential-rev-PHID-DREV-ti2yyruuhrzkxprdqwy6-req () mercurial-scm ! org
[Download RAW message or body]
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
This is not the b'r' you are looking for.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12111
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -488,7 +488,7 @@
mresult.addfile(
p,
mergestatemod.ACTION_PATH_CONFLICT,
- (pnew, mergestatemod.ACTION_REMOVE),
+ (pnew, b'r'),
b'path conflict',
)
remoteconflicts.remove(p)
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic