Merge lp://staging/~jameinel/bzr/2.3-push-copy-repo-465517 into lp://staging/bzr/2.3

Proposed by John A Meinel
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 5631
Proposed branch: lp://staging/~jameinel/bzr/2.3-push-copy-repo-465517
Merge into: lp://staging/bzr/2.3
Diff against target: 109 lines (+61/-1)
4 files modified
bzrlib/controldir.py (+4/-0)
bzrlib/tests/blackbox/test_push.py (+16/-0)
bzrlib/tests/per_branch/test_push.py (+36/-1)
doc/en/release-notes/bzr-2.3.txt (+5/-0)
To merge this branch: bzr merge lp://staging/~jameinel/bzr/2.3-push-copy-repo-465517
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+54218@code.staging.launchpad.net

Commit message

Fix bug #465517, 'bzr push' to a repo w/ no branch should only push the branch ancestry, not all revs in the repo.

Description of the change

This fixes a long-standing bug. If you interrupt a push to a new branch on Launchpad, it can leave a Repository with no Branch. If you then start the push over again, you end up pushing the whole local repository, instead of just the tip revision. (Most noticeable in my repo that mixes plugins with bzr source.)

It doesn't solve the remaining bug, that the final branch isn't stacked like it should be. But I'm not subscribed as "In Progress" to that bug :).

I'm targeting 2.3 because it was easy enough. I thought about backporting, but at 2.3 we switched from having the code in "bzrdir.py" to "controldir.py", and that was a sufficient threshold that I didn't bother going further back.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

W00t.

"But I'm not subscribed as "In Progress" to that bug :)" doesn't parse. Do you mean you're working on that bit as well?

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/21/2011 4:29 PM, Jelmer Vernooij wrote:
> W00t.
>
> "But I'm not subscribed as "In Progress" to that bug :)" doesn't parse. Do you mean you're working on that bit as well?

I'm clearing out my "todo" queue, that bug isn't in my todo queue.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2HdKYACgkQJdeBCYSNAAMalQCbBJ9F5/Hsi3hB8XkAzaLLAiJK
zSMAoKJ4o8vLdbe5vGasA1yyoqDbvXap
=Ep5U
-----END PGP SIGNATURE-----

Revision history for this message
Martin Pool (mbp) :
review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches