equal
deleted
inserted
replaced
397 if not self.keepf: |
397 if not self.keepf: |
398 try: |
398 try: |
399 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') |
399 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') |
400 except error.Abort as e: |
400 except error.Abort as e: |
401 if e.hint is None: |
401 if e.hint is None: |
402 e.hint = b'use --keep to keep original changesets' |
402 e.hint = _(b'use --keep to keep original changesets') |
403 raise e |
403 raise e |
404 |
404 |
405 result = buildstate(self.repo, destmap, self.collapsef) |
405 result = buildstate(self.repo, destmap, self.collapsef) |
406 |
406 |
407 if not result: |
407 if not result: |