merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 18 Feb 2013 13:21:27 -0600
changeset 18703 5bef0655f2e9
parent 18702 32292ad53f9f (current diff)
parent 18701 61c8327ced50 (diff)
child 18715 c4ff927b6f68
merge with stable
mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 18 13:20:59 2013 -0600
+++ b/mercurial/commands.py	Mon Feb 18 13:21:27 2013 -0600
@@ -1068,7 +1068,7 @@
         dest = ui.expandpath(dest or 'default-push', dest or 'default')
         dest, branches = hg.parseurl(dest, opts.get('branch'))
         other = hg.peer(repo, opts, dest)
-        revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
+        revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
         heads = revs and map(repo.lookup, revs) or revs
         outgoing = discovery.findcommonoutgoing(repo, other,
                                                 onlyheads=heads,
--- a/tests/test-bundle.t	Mon Feb 18 13:20:59 2013 -0600
+++ b/tests/test-bundle.t	Mon Feb 18 13:21:27 2013 -0600
@@ -522,6 +522,21 @@
   [255]
   $ cd ..
 
+test to bundle revisions on the newly created branch (issue3828):
+
+  $ hg -q clone -U test test-clone
+  $ cd test
+
+  $ hg -q branch foo
+  $ hg commit -m "create foo branch"
+  $ hg -q outgoing ../test-clone
+  9:b4f5acb1ee27
+  $ hg -q bundle --branch foo foo.hg ../test-clone
+  $ hg -R foo.hg -q log -r "bundle()"
+  9:b4f5acb1ee27
+
+  $ cd ..
+
 test for http://mercurial.selenic.com/bts/issue1144
 
 test that verify bundle does not traceback