D782: merge: improve error messages for path conflicts during update

[ryanmce (Ryan McElroy)]

ryanmce accepted this revision.
ryanmce added a comment.


  nice improvement

INLINE COMMENTS

> merge.py:741-747
> +        if f in pathconflicts:
> +            if repo.wvfs.isfileorlink(f):
> +                repo.ui.warn(_("%s: untracked file conflicts with directory\n")
> +                             % f)
> +            else:
> +                repo.ui.warn(_("%s: untracked directory conflicts with file\n")
> +                             % f)

Consider saving a line with `warn = repo.ui.warn`

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D782

To: mbthomas, #hg-reviewers, ryanmce
Cc: ryanmce, mercurial-devel