##// END OF EJS Templates
reabase: call rewriteutil.precheck() a bit later...
Martin von Zweigbergk -
r47592:80cac993 default
parent child Browse files
Show More
@@ -413,15 +413,6 b' class rebaseruntime(object):'
413 if not destmap:
413 if not destmap:
414 return _nothingtorebase()
414 return _nothingtorebase()
415
415
416 rebaseset = destmap.keys()
417 if not self.keepf:
418 try:
419 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
420 except error.Abort as e:
421 if e.hint is None:
422 e.hint = _(b'use --keep to keep original changesets')
423 raise e
424
425 result = buildstate(self.repo, destmap, self.collapsef)
416 result = buildstate(self.repo, destmap, self.collapsef)
426
417
427 if not result:
418 if not result:
@@ -450,6 +441,15 b' class rebaseruntime(object):'
450 # Calculate self.obsolete_* sets
441 # Calculate self.obsolete_* sets
451 self._handleskippingobsolete()
442 self._handleskippingobsolete()
452
443
444 rebaseset = destmap.keys()
445 if not self.keepf:
446 try:
447 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
448 except error.Abort as e:
449 if e.hint is None:
450 e.hint = _(b'use --keep to keep original changesets')
451 raise e
452
453 self.prepared = True
453 self.prepared = True
454
454
455 def _assignworkingcopy(self):
455 def _assignworkingcopy(self):
@@ -325,9 +325,8 b' Check rebasing public changeset'
325
325
326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
327 $ hg rebase -d 0 -b 6
327 $ hg rebase -d 0 -b 6
328 abort: cannot rebase public changesets
328 nothing to rebase
329 (see 'hg help phases' for details)
329 [1]
330 [10]
331 $ hg rebase -d 5 -b 6
330 $ hg rebase -d 5 -b 6
332 abort: cannot rebase public changesets
331 abort: cannot rebase public changesets
333 (see 'hg help phases' for details)
332 (see 'hg help phases' for details)
General Comments 0
You need to be logged in to leave comments. Login now