lp://staging/~mbp/bzr/764108-diffoptions

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/bzr

John A Meinel: Approve on 2011-08-05

Diff: 98 lines (+78/-2) (has conflicts)

2 files modified

bzrlib/diff.py (+12/-2)
bzrlib/tests/test_diff.py (+66/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #764108: want per-file regexp for enclosing function in diff

Medium

In Progress

Link a bug report

Related blueprints

5731. By Martin Pool on 2011-04-18

merge trunk, including test_diff cleanups

5730. By Martin Pool on 2011-04-18

Add xfail test for showing function name in diff hunk (bug 764108)

5729. By Sergei Golubchik on 2011-03-20

support diff -F in all generated diffs
with per-file configuration rules

5728. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-17

(vila) Open trunk again as 2.4dev2 (Vincent Ladeuil)

5727. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-17

(vila) Release 2.4b1 (Vincent Ladeuil)

5726. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-16

(spiv) Add 'changelog_merge' plugin. (Andrew Bennetts)

5725. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-15

(jam) 'bzr export' needs to be in binary encoding for exporting to
 '-'.

5724. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-15

(jelmer) Fix some export bugs. (Jelmer Vernooij)

5723. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(vila) Merge 2.3 into trunk including additional fix for #654733
 (Vincent Ladeuil)

5722. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(jelmer) Allow CommitBuilder implementations to not provide a
 record_entry_contents implementation. (Jelmer Vernooij)