Rev 189: Merge bzr-git into the installers. in http://bazaar.launchpad.net/~jameinel/other/bzr-windows-installers

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/other/bzr-windows-installers

------------------------------------------------------------
revno: 189 [merge]
revision-id: john at arbash-meinel.com-20111117091207-o78e3g34fmkfw2z2
parent: john at arbash-meinel.com-20111114132334-nlcu1rqw0sob8lgr
parent: jelmer at samba.org-20110917005043-kyh47kocltas9kpm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-windows-installers
timestamp: Thu 2011-11-17 10:12:07 +0100
message:
  Merge bzr-git into the installers.
modified:
  bazaar_releases.py             bazaar_releases.py-20100303171629-75uvlxv877gacr2j-1
-------------- next part --------------
=== modified file 'bazaar_releases.py'
--- a/bazaar_releases.py	2011-11-14 12:52:21 +0000
+++ b/bazaar_releases.py	2011-11-17 09:12:07 +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.5b2'),
+        dulwich.copy_write(revision='tag:dulwich-0.8.0'),
         subvertpy.copy_write(revision='tag:subvertpy-0.8.9'),
         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'),
         python_fastimport,
         subvertpy,
         tortoisebzr,
@@ -358,6 +363,7 @@
         colo,
         explorer,
         bzr_fastimport,
+        git.copy_write(revision='tag:bzr-git-0.6.2'),
         loom,
         pipeline,
         rewrite,