Merge lp:~bialix/bzr-windows-installers/changelog_plugin into lp:bzr-windows-installers

[Alexander Belchenko]

Add built-in changelog_merge plugin to standalone installer.

[John A Meinel (jameinel)]

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

On 7/4/2011 11:19 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr-windows-installers/changelog_plugin into lp:bzr-windows-installers.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~bialix/bzr-windows-installers/changelog_plugin/+merge/66760
>
> Add built-in changelog_merge plugin to standalone installer.

The changelog_merge plugin doesn't exist in the 2.2 or 2.3 releases,
only in 2.4 and trunk. So I edited the code to not try to install it in
the older versions, and merged this.

 merge: approve

John
=:->

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

iEYEARECAAYFAk4S5IQACgkQJdeBCYSNAAM+cQCeJCYIfslb+pg8HS0X8/4DkTeZ
3KoAoIa6GzFrACswSYFaEFsLpiPJ5nYp
=HyVk
-----END PGP SIGNATURE-----

review: Approve

[John A Meinel (jameinel)]

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

On 7/4/2011 11:19 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr-windows-installers/changelog_plugin into lp:bzr-windows-installers.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~bialix/bzr-windows-installers/changelog_plugin/+merge/66760
>
> Add built-in changelog_merge plugin to standalone installer.

Also Alexander, you still have all of the 'bzr' tags in your branch. You
can run:

 cd bzr-windows-installers
 for t in `cat deleted_tags.txt`; do bzr tag --delete $t; done

I'm not sure how else for you to do it. (You can copy the
.bzr/branch/tags file from Launchpad and overwrite your own, I guess.)

I noticed because bzr>2.3 will copy all the revisions for all the tags,
which means that committing/pushing to a bzr-windows-installers branch
will copy up the whole history of bzr if you haven't deleted the extra tags.

It is a little bit cumbersome, I agree. The other option is to delete
your local branch, and start from scratch from
'lp:bzr-windows-installers'. I've verified that it doesn't have the
extra tags.

John
=:->

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

iEYEARECAAYFAk4S5VAACgkQJdeBCYSNAAOnsQCgzIvS2jo1GX83MktvsIAAFbxz
WO0AniDIkLTGvAnMJ9MGMxwqEq15Pt80
=qZAi
-----END PGP SIGNATURE-----

[Alexander Belchenko (bialix)]

John Arbash Meinel пишет:
> Also Alexander, you still have all of the 'bzr' tags in your branch.

> It is a little bit cumbersome, I agree. The other option is to delete
> your local branch, and start from scratch from
> 'lp:bzr-windows-installers'. I've verified that it doesn't have the
> extra tags.

Oops. I'll re-create the branch from scratch.

thank you for reviewing it, I didn't realize this change should be
applied only for 2.4 and trunk, not sure why I did such mistake.

=== modified file 'bazaar_releases.py'
--- bazaar_releases.py	2011-06-17 11:10:39 +0000
+++ bazaar_releases.py	2011-07-04 09:19:23 +0000
@@ -103,10 +103,15 @@
 python_fastimport = Project('fastimport', branch='lp:python-fastimport')
 tortoisebzr = Project('tortoisebzr', branch='lp:tortoisebzr')
 
+# Core plugins
+changelog_merge = Plugin('changelog_merge',
+                         "Merge hook for GNU ChangeLog files", core=True)
 launchpad = Plugin('launchpad', "Launchpad.net integration", core=True)
 netrc_credential_store = Plugin('netrc_credential_store',
                                 "netrc (credential store example)", core=True)
 news_merge = Plugin('news_merge', "Smart merging of NEWS files", core=True)
+
+# Other plugins
 bzrtools = Plugin('bzrtools', "BzrTools (miscellaneous additions)")
 colo = Plugin('bzr-colo', "Colo (work with colocated branches)")
 explorer = Plugin('bzr-explorer', "Bazaar Explorer", display_in_installer=False)
@@ -135,6 +140,7 @@
 
     # The plugins to bundle
     plugins = [
+        changelog_merge,
         launchpad,
         netrc_credential_store,
         news_merge,
@@ -205,6 +211,7 @@
 
     # The plugins to bundle
     plugins = [
+        changelog_merge,
         launchpad,
         netrc_credential_store,
         news_merge,
@@ -252,6 +259,7 @@
 
     # The plugins to bundle
     plugins = [
+        changelog_merge,
         launchpad,
         netrc_credential_store,
         news_merge,
@@ -296,6 +304,7 @@
 
     # The plugins to bundle
     plugins = [
+        changelog_merge,
         launchpad,
         netrc_credential_store,
         news_merge,
@@ -335,4 +344,3 @@
     BAZAAR_2_4,
     BAZAAR_TRUNK,
     ]
-