Mercurial > hg
diff mercurial/localrepo.py @ 20184:a14d93b2fb1b
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 | 969148b49fc6 |
children | 4d6d5ef88538 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Nov 21 15:46:49 2013 -0500 +++ b/mercurial/localrepo.py Mon Nov 11 21:16:54 2013 +1100 @@ -1867,9 +1867,10 @@ raise util.Abort(_(mst) % (ctx.troubles()[0], ctx)) + newbm = self.ui.configlist('bookmarks', 'pushing') discovery.checkheads(unfi, remote, outgoing, remoteheads, newbranch, - bool(inc)) + bool(inc), newbm) # TODO: get bundlecaps from remote bundlecaps = None