Merge lp://staging/~jelmer/bzr-windows-installers/bzr-git into lp://staging/bzr-windows-installers

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 189
Proposed branch: lp://staging/~jelmer/bzr-windows-installers/bzr-git
Merge into: lp://staging/bzr-windows-installers
Diff against target: 66 lines (+14/-1) (has conflicts)
1 file modified
bazaar_releases.py (+14/-1)
Text conflict in bazaar_releases.py
To merge this branch: bzr merge lp://staging/~jelmer/bzr-windows-installers/bzr-git
Reviewer Review Type Date Requested Status
John A Meinel Pending
Review via email: mp+79398@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-09-19.

Description of the change

Add dulwich/bzr-git to the installer.

This is completely untested, but I'm hoping somebody else will have a chance to do some more testing of it as I don't have the environment for building installers here.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote : Posted in a previous version of this proposal

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

On 9/19/2011 10:21 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging
> lp:~jelmer/bzr-windows-installers/bzr-git into
> lp:bzr-windows-installers.
>
> Requested reviews: Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-windows-installers/bzr-git/+merge/76100
>
> Add dulwich/bzr-git to the installer.
>
> This is completely untested, but I'm hoping somebody else will have
> a chance to do some more testing of it as I don't have the
> environment for building installers here.

I'm not sure all the parts you've touched. I would probably like to
avoid adding bzr-git to the 2.4-and-earlier series, since those are
considered 'stable'. I think it would be good to add to the 2.5
installers. I suppose we could come back later and add bzr-git to old
stable series if we find it works really well and people want them in
the stable releases. I'd just start with beta-only for now.

I'm probably going to skip this for bzr-2.5b1-1, but I could consider
it for bzr-2.5b1-2 or bzr-2.5b2-1. Thoughts?

 review: needsinfo

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

iEYEARECAAYFAk54dqEACgkQJdeBCYSNAAML0gCg0LaSC+4Q1KrVK0T22OP6UzX0
wmQAn1iwF5RhGFUOTJI/E6L5Eo6FKjrI
=4zom
-----END PGP SIGNATURE-----

review: Needs Information
Revision history for this message
Jelmer Vernooij (jelmer) wrote : Posted in a previous version of this proposal

On Tue 20 Sep 2011 13:18:57 CEST, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 9/19/2011 10:21 PM, Jelmer Vernooij wrote:
>> Jelmer Vernooij has proposed merging
>> lp:~jelmer/bzr-windows-installers/bzr-git into
>> lp:bzr-windows-installers.
>>
>> Requested reviews: Bazaar Developers (bzr)
>>
>> For more details, see:
>> https://code.launchpad.net/~jelmer/bzr-windows-installers/bzr-git/+merge/76100
>>
>> Add dulwich/bzr-git to the installer.
>>
>> This is completely untested, but I'm hoping somebody else will have
>> a chance to do some more testing of it as I don't have the
>> environment for building installers here.
>
> I'm not sure all the parts you've touched. I would probably like to
> avoid adding bzr-git to the 2.4-and-earlier series, since those are
> considered 'stable'. I think it would be good to add to the 2.5
> installers. I suppose we could come back later and add bzr-git to old
> stable series if we find it works really well and people want them in
> the stable releases. I'd just start with beta-only for now.
That's probably a good idea.

> I'm probably going to skip this for bzr-2.5b1-1, but I could consider
> it for bzr-2.5b1-2 or bzr-2.5b2-1. Thoughts?
Works for me. I'll update the MP to only change 2.5 once you've landed
that.

Cheers,

Jelmer

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Posted in a previous version of this proposal

bzr 2.5b1 is out now. ping?

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

2.5b2 and 2.5b3 are out too. ping ? :-)

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