This is an archive of the discontinued Mercurial Phabricator instance.

scmutil: don't try to delete origbackup symlinks to directories (issue5731)
ClosedPublic

Authored by mbthomas on Nov 3 2017, 12:25 PM.

Details

Summary

When origbackuppath is set, when looking to see if a file we are backing up
conflicts with a directory in the origbackuppath, we incorrectly match on
symlinks to directories. This means we try to call vfs.rmtree on the
symlink, which fails.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Nov 3 2017, 12:25 PM
mbthomas updated this revision to Diff 3265.Nov 3 2017, 12:27 PM
yuja accepted this revision.Nov 9 2017, 8:17 AM
yuja added a subscriber: yuja.

Queued for stable, thanks.

This revision is now accepted and ready to land.Nov 9 2017, 8:17 AM
This revision was automatically updated to reflect the committed changes.