( )⚙ D12111 merge: stop using merge action for pathconflict option

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12111

merge: stop using merge action for pathconflict option
ClosedPublic

Authored by marmoute on Jan 29 2022, 9:13 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG25d5dffbb211: merge: stop using merge action for pathconflict option
Summary

This is not the b'r' you are looking for.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jan 29 2022, 9:13 AM
Alphare accepted this revision.Feb 3 2022, 4:06 AM
Alphare added a subscriber: Alphare.

If anyone is as puzzled as I am as to what this is, it's for remote (as opposed to local), see mercurial/merge.py:1535.

This revision is now accepted and ready to land.Feb 3 2022, 4:06 AM
marmoute added a commit: rHG25d5dffbb211: merge: stop using merge action for pathconflict option.Feb 4 2022, 5:29 AM
Closed by commit rHG25d5dffbb211: merge: stop using merge action for pathconflict option (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)

Diff 32007

mercurial/merge.py

pnew, pnew,
mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
(p, fl), (p, fl),
b'remote path conflict', b'remote path conflict',
) )
mresult.addfile( mresult.addfile(
p, p,
mergestatemod.ACTION_PATH_CONFLICT, mergestatemod.ACTION_PATH_CONFLICT,
(pnew, mergestatemod.ACTION_REMOVE), (pnew, b'r'),
b'path conflict', b'path conflict',
) )
remoteconflicts.remove(p) remoteconflicts.remove(p)
break break
if invalidconflicts: if invalidconflicts:
for p in invalidconflicts: for p in invalidconflicts:
repo.ui.warn(_(b"%s: is both a file and a directory\n") % p) repo.ui.warn(_(b"%s: is both a file and a directory\n") % p)