lp:~garyvdm/bzr/diff_using_gui

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:bzr

John A Meinel: Needs Fixing on 2010-05-12

Gordon Tyler: Needs Fixing on 2010-04-25

Diff: 274 lines (+139/-22)

4 files modified

NEWS (+9/-0)
bzrlib/builtins.py (+13/-1)
bzrlib/diff.py (+69/-19)
bzrlib/tests/test_diff.py (+48/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #490212: Some diff/merge tool can handle multiple files but bzr does not support it

Low

In Progress

Link a bug report

Related blueprints

5175. By Gary van der Merwe on 2010-06-16

Make tests pass (caused due to change in imports merged from bzr.dev.)

5174. By Gary van der Merwe on 2010-06-16

Merge bzr.dev.

5173. By Gary van der Merwe on 2010-04-25

Merge bzr.dev.

5172. By Gary van der Merwe on 2010-04-25

Update NEWS.

5171. By Gary van der Merwe on 2010-04-25

Test simultaneous_processes, and list_template behaviors.

5170. By Gary van der Merwe on 2010-04-25

Documentation for new --using usage.

5169. By Gary van der Merwe on 2010-04-25

Add tests for from_string.

5168. By Gary van der Merwe on 2010-04-25

Fix existing tests.

5167. By Gary van der Merwe on 2010-04-24

Add syntax for diff --using to launch with a list of files to diff.

5166. By Gary van der Merwe on 2010-04-24

Add syntax for diff --using to launch processes simultaneously.