Show More
@@ -623,6 +623,7 b' def reposetup(ui, repo):' | |||||
623 |
|
623 | |||
624 | def rollback(self, dryrun=False, force=False): |
|
624 | def rollback(self, dryrun=False, force=False): | |
625 | wlock = self.wlock() |
|
625 | wlock = self.wlock() | |
|
626 | origrestrict = kwt.restrict | |||
626 | try: |
|
627 | try: | |
627 | if not dryrun: |
|
628 | if not dryrun: | |
628 | changed = self['.'].files() |
|
629 | changed = self['.'].files() | |
@@ -630,10 +631,12 b' def reposetup(ui, repo):' | |||||
630 | if not dryrun: |
|
631 | if not dryrun: | |
631 | ctx = self['.'] |
|
632 | ctx = self['.'] | |
632 | modified, added = _preselect(ctx.status(), changed) |
|
633 | modified, added = _preselect(ctx.status(), changed) | |
|
634 | kwt.restrict = False | |||
633 | kwt.overwrite(ctx, modified, True, True) |
|
635 | kwt.overwrite(ctx, modified, True, True) | |
634 | kwt.overwrite(ctx, added, True, False) |
|
636 | kwt.overwrite(ctx, added, True, False) | |
635 | return ret |
|
637 | return ret | |
636 | finally: |
|
638 | finally: | |
|
639 | kwt.restrict = origrestrict | |||
637 | wlock.release() |
|
640 | wlock.release() | |
638 |
|
641 | |||
639 | # monkeypatches |
|
642 | # monkeypatches |
General Comments 0
You need to be logged in to leave comments.
Login now