D680: scmutil: handle conflicting files and dirs in origbackuppath
mbthomas (Mark Thomas)
phabricator at mercurial-scm.org
Mon Oct 2 17:04:45 EDT 2017
mbthomas added a comment.
With `ui.origbackuppath` set to some value, backup should be completely reliable. The file at `$origbackuppath/path/to/file` will be the most recent version of that file that was backed up. It will be overwritten/deleted if a backup of any file named `$origbackuppath/path/to/file`, `$origbackuppath/path/to` or `$origbackuppath/path` is subsequently made. This seems reasonable to me.
If `ui.origbackuppath` not set, then behaviour is still unreliable in the presence of files also named `something.orig`, but that is not changed behaviour. We discussed this at the sprint and decided that we didn't want to change the default behaviour of creating `.orig` files.
INLINE COMMENTS
> kiilerix wrote in scmutil.py:576
> Now, this seems like a separate trivial change, fixing the problem that origbackuppath couldn't be overridden.
Happy to split this out, but this stack is already pretty tall.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D680
To: mbthomas, ryanmce, #hg-reviewers, durham, yuja, ikostia
Cc: kiilerix, quark, ikostia, yuja, durham, mercurial-devel
More information about the Mercurial-devel
mailing list