equal
deleted
inserted
replaced
627 class fold(histeditaction): |
627 class fold(histeditaction): |
628 def verify(self, prev): |
628 def verify(self, prev): |
629 """ Verifies semantic correctness of the fold rule""" |
629 """ Verifies semantic correctness of the fold rule""" |
630 super(fold, self).verify(prev) |
630 super(fold, self).verify(prev) |
631 repo = self.repo |
631 repo = self.repo |
632 state = self.state |
|
633 if not prev: |
632 if not prev: |
634 c = repo[self.node].parents()[0] |
633 c = repo[self.node].parents()[0] |
635 elif not prev.verb in ('pick', 'base'): |
634 elif not prev.verb in ('pick', 'base'): |
636 return |
635 return |
637 else: |
636 else: |