D680: scmutil: handle conflicting files and dirs in origbackuppath

[ryanmce (Ryan McElroy)]

ryanmce added a subscriber: ikostia.
ryanmce added a comment.


  Calling in windows path expert @ikostia

REPOSITORY
  rHG Mercurial

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

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