Add a new merge action to record path conflicts. A status message is
printed, and the path conflict is added to the merge state.
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
Event Timeline
Comment Actions
There's some opportunities here but most are definitely outside the scope of this patch. One inline to consider but do what makes sense to you.
mercurial/merge.py | ||
---|---|---|
1254–1263 | I've seen this trick used in the mercurial codebase to fit more on a single line: s = repo.ui.status ... s(_("%s: path conflict - a file or link has the same name as a directory\n") % f) ... s(_("resolve manually then use 'hg resolve --mark %s'\n") % f) ... It may help to tighten up the code a bit here. | |
1717 | future refactoring opportunity! -- this is incredibly ugly, but it's not your fault. | |
mercurial/sparse.py | ||
490 | Another future refactoring opportunity. |
I've seen this trick used in the mercurial codebase to fit more on a single line:
It may help to tighten up the code a bit here.