Mercurial > hg-stable
changeset 22373:f6a1386d540e
revert: no backup for `dsadded` set
There is only one case where a backup is required in the `dsadded` set, and the
current backup mechanism fails to handle it. So we stop trying to do backups at
all for now. This will help us to simplify the backup code and finally fix
this backup issue.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sat, 30 Aug 2014 01:49:28 +0200 |
| parents | 8da5864dcfda |
| children | 4509a16c76c2 |
| files | mercurial/cmdutil.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Aug 30 16:06:09 2014 +0200 +++ b/mercurial/cmdutil.py Sat Aug 30 01:49:28 2014 +0200 @@ -2525,7 +2525,7 @@ # Modified compared to target, local change (dsmodified, actions['revert'], backup), # Added since target - (dsadded, actions['remove'], backup), + (dsadded, actions['remove'], discard), # Removed since target, before working copy parent (removed, actions['add'], backup), # Removed since targe, marked as such in working copy parent @@ -2537,7 +2537,7 @@ (unknown, actions['unknown'], discard), ) - needdata = ('revert', 'add', 'remove', 'undelete') + needdata = ('revert', 'add', 'undelete') _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata]) for abs, (rel, exact) in sorted(names.items()):