hgext/rebase.py
branchstable
changeset 16228 5b41d5ad52bf
parent 15945 cd42f77d30c4
child 16280 0806823370d8
--- a/hgext/rebase.py	Thu Mar 01 14:42:23 2012 +0000
+++ b/hgext/rebase.py	Sun Mar 04 17:12:12 2012 -0600
@@ -628,6 +628,7 @@
             ui.debug('--update and --rebase are not compatible, ignoring '
                      'the update flag\n')
 
+        movemarkfrom = repo['.'].node()
         cmdutil.bailifchanged(repo)
         revsprepull = len(repo)
         origpostincoming = commands.postincoming
@@ -646,6 +647,9 @@
             if dest != repo['.'].rev():
                 # there was nothing to rebase we force an update
                 hg.update(repo, dest)
+                if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
+                    ui.status(_("updating bookmark %s\n")
+                              % repo._bookmarkcurrent)
     else:
         if opts.get('tool'):
             raise util.Abort(_('--tool can only be used with --rebase'))