# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1330902870 21600
# Node ID 5cb2693e1a6007441cb902eb44b8f980fef1aea2
# Parent  7855c522a9cb9ac3c57dde46d5820d0fb07f3c76# Parent  5b41d5ad52bfd2a91197ab6908a3704244463f87
merge with stable

diff -r 7855c522a9cb -r 5cb2693e1a60 hgext/rebase.py
--- a/hgext/rebase.py	Sun Mar 04 16:48:04 2012 -0600
+++ b/hgext/rebase.py	Sun Mar 04 17:14:30 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'))
diff -r 7855c522a9cb -r 5cb2693e1a60 tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t	Sun Mar 04 16:48:04 2012 -0600
+++ b/tests/test-rebase-pull.t	Sun Mar 04 17:14:30 2012 -0600
@@ -77,6 +77,7 @@
 
   $ cd ../c
 
+  $ hg book norebase
   $ hg pull --rebase
   pulling from $TESTTMP/a (glob)
   searching for changes
@@ -86,6 +87,7 @@
   added 1 changesets with 1 changes to 1 files
   nothing to rebase
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  updating bookmark norebase
 
   $ hg tglog -l 1
   @  2: 'R1'