news_merge example configuration won't work

[Martin von Gagern]

I've configured the news_merge plugin as "bzr help news_merge" suggests:

[/path/to/bzr/*]
news_merge_files = NEWS
news_merge_files:policy = recurse

The result is a lengthy backtrace when I do merge branches under that repository. The last lines:

  File "/usr/lib64/python2.6/site-packages/bzrlib/config.py", line 602, in _get_option_policy
    return _policy_value[policy_name]
KeyError: u'recurse'

bzr 2.1.1 on python 2.6.5 (Linux-2.6.33-gentoo-x86_64-AMD_Phenom-tm-_II_X4_945_Processor-with-gentoo-2.0.1)

I have no clue what this recurse policy should do, but it doesn't seem to work for me. Dropping it helps.

[John A Meinel (jameinel)]

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

Martin von Gagern wrote:
> Public bug reported:
>
> I've configured the news_merge plugin as "bzr help news_merge" suggests:
>
> [/path/to/bzr/*]
> news_merge_files = NEWS
> news_merge_files:policy = recurse
>
> The result is a lengthy backtrace when I do merge branches under that
> repository. The last lines:
>
> File "/usr/lib64/python2.6/site-packages/bzrlib/config.py", line 602, in _get_option_policy
> return _policy_value[policy_name]
> KeyError: u'recurse'
>
> bzr 2.1.1 on python 2.6.5 (Linux-2.6.33-gentoo-x86_64-AMD_Phenom-tm-
> _II_X4_945_Processor-with-gentoo-2.0.1)
>
> I have no clue what this recurse policy should do, but it doesn't seem
> to work for me. Dropping it helps.
>
> ** Affects: bzr
> Importance: Undecided
> Status: New
>

Just remove the "= recurse" line. The default policy is 'recurse' and we
don't actually allow you to set it. (there is 'norecurse' and 'appendpath'.)

Essentially this is just a doc bug in how to configure the plugin.

John
=:->

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

iEYEARECAAYFAku1NugACgkQJdeBCYSNAAOMVwCdFi/MA4dGjJEJj8vcRwSemguv
LG8An0wGPlEd//CiP3viBDelqdWkK4b9
=3yar
-----END PGP SIGNATURE-----