lp:~spiv/bzr/better-news-merge

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:bzr

Robert Collins (community): Needs Fixing on 2010-02-13

Diff: 747 lines (+587/-64)

7 files modified

NEWS (+4/-0)
bzrlib/merge3.py (+18/-4)
bzrlib/plugins/news_merge/__init__.py (+22/-2)
bzrlib/plugins/news_merge/news_merge.py (+230/-57)
bzrlib/plugins/news_merge/parser.py (+196/-1)
bzrlib/plugins/news_merge/tests/__init__.py (+1/-0)
bzrlib/plugins/news_merge/tests/test_parser.py (+116/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #517490: news_merge confused by added sections

Low

Confirmed

Link a bug report

Related blueprints

4822. By Andrew Bennetts on 2010-04-20

Fix some simple bugs.

4821. By Andrew Bennetts on 2010-04-20

Possibly working news_merge built on a richer structure than just lines.

4820. By Andrew Bennetts on 2010-04-20

Merge object-3way-merge.

4819. By Andrew Bennetts on 2010-04-20

Merge lp:bzr.

4818. By Andrew Bennetts on 2010-04-20

Rename test.

4817. By Andrew Bennetts on 2010-04-19

First steps towards a better NEWS file parser.

4816. By Andrew Bennetts on 2010-03-19

Add a XXX comment for future improvement.

4815. By Andrew Bennetts on 2010-03-19

Read section order from template file named in config.

4814. By Andrew Bennetts on 2010-02-12

Teach news_merge to handle conflicts involving section headings as well as bullets.

4813. By Andrew Bennetts on 2010-02-12

Add some simple mutters so that it's easy to tell if news_merge has been triggered.