D680: scmutil: handle conflicting files and dirs in origbackuppath

Tue Sep 19 06:21:19 EDT 2017

mbthomas marked 2 inline comments as done.
mbthomas added inline comments.

INLINE COMMENTS

> yuja wrote in scmutil.py:570
> Perhaps fullorigpath may be a Windows path, but util.finddirs()
> can only handle internal path.

I've changed it to use `util.normpath`, which I think converts back to `/` as separator on windows (`windows.normpath` calls `windows.pconvert`), and is probably a good idea anyway.  Is this sufficient?

REPOSITORY
  rHG Mercurial

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

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