Mercurial > hg-stable

diff mercurial/commands.py @ 20184:a14d93b2fb1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: allow push -B to create a new remote head (issue2372) Push is currently allowed to create a new head if there is a remote bookmark that will be updated to point to the new head. If the bookmark is not known remotely then push aborts, even if a -B argument is about to push the bookmark. This change allows push to continue in this case. This does not require a wireproto force.
author Stephen Lee <sphen.lee@gmail.com>
date Mon, 11 Nov 2013 21:16:54 +1100
parents 04036798ebed
children cbe2bcc927cd
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Nov 21 15:46:49 2013 -0500
+++ b/mercurial/commands.py	Mon Nov 11 21:16:54 2013 +1100
@@ -4677,6 +4677,7 @@
     """
 
     if opts.get('bookmark'):
+        ui.setconfig('bookmarks', 'pushing', opts['bookmark'])
         for b in opts['bookmark']:
             # translate -B options to -r so changesets get pushed
             if b in repo._bookmarks: