##// END OF EJS Templates
rebase: abort if *any* commit in rebase set is public
Martin von Zweigbergk -
r31302:681046de default
parent child Browse files
Show More
@@ -326,11 +326,11 b' class rebaseruntime(object):'
326 self.ui.status(_('nothing to rebase\n'))
326 self.ui.status(_('nothing to rebase\n'))
327 return _nothingtorebase()
327 return _nothingtorebase()
328
328
329 root = min(rebaseset)
329 for root in self.repo.set('roots(%ld)', rebaseset):
330 if not self.keepf and not self.repo[root].mutable():
330 if not self.keepf and not root.mutable():
331 raise error.Abort(_("can't rebase public changeset %s")
331 raise error.Abort(_("can't rebase public changeset %s")
332 % self.repo[root],
332 % root,
333 hint=_("see 'hg help phases' for details"))
333 hint=_("see 'hg help phases' for details"))
334
334
335 (self.originalwd, self.target, self.state) = result
335 (self.originalwd, self.target, self.state) = result
336 if self.collapsef:
336 if self.collapsef:
@@ -329,6 +329,10 b' Check rebasing public changeset'
329 abort: can't rebase public changeset e1c4361dd923
329 abort: can't rebase public changeset e1c4361dd923
330 (see 'hg help phases' for details)
330 (see 'hg help phases' for details)
331 [255]
331 [255]
332 $ hg rebase -d 5 -r '1 + (6::)'
333 abort: can't rebase public changeset e1c4361dd923
334 (see 'hg help phases' for details)
335 [255]
332
336
333 $ hg rebase -d 5 -b 6 --keep
337 $ hg rebase -d 5 -b 6 --keep
334 rebasing 6:e1c4361dd923 "C"
338 rebasing 6:e1c4361dd923 "C"
General Comments 0
You need to be logged in to leave comments. Login now