changeset 27344 | 43c00ca887d1 |
parent 27216 | 8117e2cd959e |
child 27391 | 4eeef1b2d689 |
--- a/mercurial/cmdutil.py Sat Dec 12 09:57:05 2015 -0800 +++ b/mercurial/cmdutil.py Mon Dec 14 18:54:03 2015 -0500 @@ -183,9 +183,9 @@ # 3a. apply filtered patch to clean repo (clean) if backups: # Equivalent to hg.revert - choices = lambda key: key in backups + m = scmutil.matchfiles(repo, backups.keys()) mergemod.update(repo, repo.dirstate.p1(), - False, True, choices) + False, True, matcher=m) # 3b. (apply) if dopatch: