Merge lp:~nmb/bzr-keywords/after-2.6 into lp:bzr-keywords

[Neil Martinsen-Burrell]

The change in r20 made the plugin work only with Bazaar versions after 2.6b2. This clarifies that requirement and tells people how to work around the problem.

[Jelmer Vernooij (jelmer)]

Couldn't we just support both? Did one of my recent changes break compatibility with older versions of bzr?

[Neil Martinsen-Burrell (nmb)]

Yes, r20 of bzr-keywords broke compatibility with versions of bzr that
don't have r6498.5.1 (merged in r6517):

nmb@garble[~/src/bzr/bzr.all]$ bzr revert -r tag:bzr-2.5.1
[...]
nmb@garble[~/src/bzr/bzr.all]$ ./bzr selftest -s bp.keywords
'module' object has no attribute 'filter_stacks_registry'
----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK

This came up on the mailing list recently and reverting to r19 fixed
the problem on bzr 2.5.0.

On Fri, Jul 20, 2012 at 8:01 AM, Jelmer Vernooij
<email address hidden> wrote:
> Couldn't we just support both? Did one of my recent changes break compatibility with older versions of bzr?
> --
> https://code.launchpad.net/~nmb/bzr-keywords/after-2.6/+merge/115257
> You are the owner of lp:~nmb/bzr-keywords/after-2.6.

[Jelmer Vernooij (jelmer)]

On Fri, Jul 20, 2012 at 01:16:18PM -0000, Neil Martinsen-Burrell wrote:
> Yes, r20 of bzr-keywords broke compatibility with versions of bzr that
> don't have r6498.5.1 (merged in r6517):

> nmb@garble[~/src/bzr/bzr.all]$ bzr revert -r tag:bzr-2.5.1
> [...]
> nmb@garble[~/src/bzr/bzr.all]$ ./bzr selftest -s bp.keywords
> 'module' object has no attribute 'filter_stacks_registry'
> ----------------------------------------------------------------------
> Ran 0 tests in 0.000s

> OK

> This came up on the mailing list recently and reverting to r19 fixed
> the problem on bzr 2.5.0.
Ah - thanks.

I've pushed a fix to fall back to the old registration function if the
new one isn't available.

Cheers,

jelmer

[Jelmer Vernooij (jelmer)]

This is superseded by bzr-keywords now supporting older versions too.

Unmerged revisions

21. By Neil Martinsen-Burrell on 2012-07-17

Clarify version dependencies in README.txt

=== modified file 'README.txt'
--- README.txt	2008-07-18 16:23:12 +0000
+++ README.txt	2012-07-17 01:02:18 +0000
@@ -18,6 +18,11 @@
 See http://bazaar-vcs.org/UsingPlugins for other options such as
 using the BZR_PLUGIN_PATH environment variable.
 
+The latest versions of this plugin are only compatible with Bazaar
+2.6.0 and later.  If you need to use an earlier version of Bazaar,
+then you should use revision 19 of this plugin (bzr branch -r 19
+lp:bzr-keywords ~/.bazaar/plugins/keywords).
+
 
 Testing
 -------