news_merge example configuration won't work
Bug #553161 reported by
Martin von Gagern
This bug affects 2 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Andrew Bennetts |
Bug Description
I've configured the news_merge plugin as "bzr help news_merge" suggests:
[/path/to/bzr/*]
news_merge_files = NEWS
news_merge_
The result is a lengthy backtrace when I do merge branches under that repository. The last lines:
File "/usr/lib64/
return _policy_
KeyError: u'recurse'
bzr 2.1.1 on python 2.6.5 (Linux-
I have no clue what this recurse policy should do, but it doesn't seem to work for me. Dropping it helps.
Related branches
lp:~spiv/bzr/fix-news-merge-help-553161
Merged
into
lp:bzr/2.1
- Vincent Ladeuil: Approve
-
Diff: 11 lines (+0/-1)1 file modifiedbzrlib/plugins/news_merge/__init__.py (+0/-1)
Changed in bzr: | |
assignee: | nobody → Andrew Bennetts (spiv) |
importance: | Undecided → High |
status: | New → Confirmed |
Changed in bzr: | |
status: | Confirmed → In Progress |
Changed in bzr: | |
milestone: | none → 2.1.2 |
status: | In Progress → Fix Released |
To post a comment you must log in.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin von Gagern wrote: files:policy = recurse python2. 6/site- packages/ bzrlib/ config. py", line 602, in _get_option_policy value[policy_ name] 2.6.33- gentoo- x86_64- AMD_Phenom- tm- 945_Processor- with-gentoo- 2.0.1)
> 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_
>
> The result is a lengthy backtrace when I do merge branches under that
> repository. The last lines:
>
> File "/usr/lib64/
> return _policy_
> KeyError: u'recurse'
>
> bzr 2.1.1 on python 2.6.5 (Linux-
> _II_X4_
>
> 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----- enigmail. mozdev. org/
1NugACgkQJdeBCY SNAAOMVwCdFi/ MA4dGjJEJj8vcRw Semguv /CiP3viBDelqdWk K4b9
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAku
LG8An0wGPlEd/
=3yar
-----END PGP SIGNATURE-----