##// END OF EJS Templates
mq: strip should not blow away local changes...
Chris Mason -
r2699:f8bcaf56 default
parent child Browse files
Show More
@@ -530,6 +530,9 b' class queue:'
530 revnum = chlog.rev(rev)
530 revnum = chlog.rev(rev)
531
531
532 if update:
532 if update:
533 (c, a, r, d, u) = repo.changes(None, None)
534 if c or a or d or r:
535 raise util.Abort(_("Local changes found"))
533 urev = self.qparents(repo, rev)
536 urev = self.qparents(repo, rev)
534 repo.update(urev, allow=False, force=True, wlock=wlock)
537 repo.update(urev, allow=False, force=True, wlock=wlock)
535 repo.dirstate.write()
538 repo.dirstate.write()
General Comments 0
You need to be logged in to leave comments. Login now