hgext/rebase.py
changeset 43940 d77230743968
parent 43934 71fee4564410
child 43978 bd88407edc0e
equal deleted inserted replaced
43939:07ebb567e8bb 43940:d77230743968
   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: