D778: merge: backup conflicting directories when getting files

[kiilerix (Mads Kiilerich)]

kiilerix added inline comments.

INLINE COMMENTS

> merge.py:1175
> +                            absf = repo.wjoin(p)
> +                            break
>                  orig = scmutil.origpath(ui, repo, absf)

This seems quite a bit slower. But I guess it never will happen in tight loops? If we have to backup a lot of files, then we have lost anyway?

REPOSITORY
  rHG Mercurial

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

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