D680: scmutil: handle conflicting files and dirs in origbackuppath

[ikostia (Kostia Balytskyi)]

ikostia added a comment.


  Here's a patch: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-September/104837.html

REPOSITORY
  rHG Mercurial

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

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