##// END OF EJS Templates
rebase: tell when reopening a closed branch head...
Mads Kiilerich -
r21027:25ee5dbe default
parent child Browse files
Show More
@@ -289,6 +289,9 b' def rebase(ui, repo, **opts):'
289 inclusive=True)
289 inclusive=True)
290 external = externalparent(repo, state, targetancestors)
290 external = externalparent(repo, state, targetancestors)
291
291
292 if dest.closesbranch() and not keepbranchesf:
293 ui.status(_('reopening closed branch head %s\n') % dest)
294
292 if keepbranchesf:
295 if keepbranchesf:
293 # insert _savebranch at the start of extrafns so if
296 # insert _savebranch at the start of extrafns so if
294 # there's a user-provided extrafn it can clobber branch if
297 # there's a user-provided extrafn it can clobber branch if
@@ -239,6 +239,17 b' Rebasing descendant onto ancestor across'
239 |/
239 |/
240 @ 0: 'A'
240 @ 0: 'A'
241
241
242
243 Reopen branch by rebase
244
245 $ hg up -qr3
246 $ hg branch -q b
247 $ hg ci -m 'create b'
248 $ hg ci -m 'close b' --close
249 $ hg rebase -b 8 -d b
250 reopening closed branch head ea9de14a36c6
251 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
252
242 $ cd ..
253 $ cd ..
243
254
244 Rebase to other head on branch
255 Rebase to other head on branch
General Comments 0
You need to be logged in to leave comments. Login now