Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 20108:af12f58e2aa0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Nov 2013 16:15:44 -0600
parents 85d9200ba9f0 2ca325ea57fa
children 1df77035c814
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Nov 18 09:09:05 2013 -0800
+++ b/mercurial/commands.py	Mon Nov 25 16:15:44 2013 -0600
@@ -837,10 +837,12 @@
                     bookmarks.deletedivergent(repo, [target], mark)
                     return
 
+                # consider successor changesets as well
+                foreground = obsolete.foreground(repo, [marks[mark]])
                 deletefrom = [b for b in divs
                               if repo[b].rev() in anc or b == target]
                 bookmarks.deletedivergent(repo, deletefrom, mark)
-                if bmctx.rev() in anc:
+                if bmctx.rev() in anc or target in foreground:
                     ui.status(_("moving bookmark '%s' forward from %s\n") %
                               (mark, short(bmctx.node())))
                     return