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

[Jelmer Vernooij]

Add dulwich/bzr-git to the installer.

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.

[John A Meinel (jameinel)]

-----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

[Jelmer Vernooij (jelmer)]

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

[Jelmer Vernooij (jelmer)]

bzr 2.5b1 is out now. ping?

Unmerged revisions

=== modified file 'bazaar_releases.py'
--- bazaar_releases.py	2011-09-13 12:23:52 +0000
+++ bazaar_releases.py	2011-09-19 20:20:26 +0000
@@ -99,6 +99,7 @@
         self.description = description
         self.params = params
 
+dulwich = Project('dulwich')
 subvertpy = Project('subvertpy', branch='lp:~jelmer/subvertpy/trunk')
 python_fastimport = Project('fastimport', branch='lp:python-fastimport')
 tortoisebzr = Project('tortoisebzr', branch='lp:tortoisebzr')
@@ -116,11 +117,12 @@
 colo = Plugin('bzr-colo', "Colo (work with colocated branches)")
 explorer = Plugin('bzr-explorer', "Bazaar Explorer", display_in_installer=False)
 bzr_fastimport = Plugin('bzr-fastimport', "FastImport (import/export of history)")
+git = Plugin('git', "Git integration")
 loom = Plugin('bzr-loom', "Loom (manage a stack of patches over an upstream)")
 pipeline = Plugin('bzr-pipeline',
                   "Pipeline (work on large changes as smaller pieces)")
 rewrite = Plugin('bzr-rewrite', "Rewrite (change history by rebasing)")
-svn = Plugin('bzr-svn', "Subversion 1.6 integration")
+svn = Plugin('bzr-svn', "Subversion integration")
 upload = Plugin('bzr-upload', "Upload working tree")
 xmloutput = Plugin('bzr-xmloutput', "XmlOutput (interface for IDEs)")
 qbzr = Plugin('qbzr', "QBzr (dialogs for GUI applications and IDEs)")
@@ -297,6 +299,7 @@
     # The projects to bundle
     projects = [
         Project('bzr', 'lp:bzr/2.5', revision='tag:bzr-2.5b1'),
+        dulwich.copy_write(revision='tag:dulwich-0.8.0'),
         subvertpy.copy_write(revision='tag:subvertpy-0.8.0'),
         python_fastimport.copy_write(revision='tag:fastimport-0.9.0'),
         tortoisebzr.copy_write(revision='tag:release-0.6.5'),
@@ -312,6 +315,7 @@
         colo,
         explorer.copy_write(revision='tag:release-1.2.1'),
         bzr_fastimport,
+        git.copy_write(revision='tag:bzr-git-0.6.2'),
         loom,
         pipeline,
         rewrite,
@@ -343,6 +347,7 @@
     # The projects to bundle
     projects = [
         Project('bzr'),
+        dulwich.copy_write(revision='tag:dulwich-0.8.0'),
         subvertpy,
         tortoisebzr,
         ],
@@ -357,6 +362,7 @@
         colo,
         explorer,
         bzr_fastimport,
+        git.copy_write(revision='tag:bzr-git-0.6.2'),
         loom,
         pipeline,
         rewrite,