lp:~toshio/bzr-gtk/handle-dirty-patches

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-gtk/gtk2

Bazaar GTK maintainers: Pending requested 2010-02-08

Diff: 37 lines (+4/-3)

2 files modified

bzr-handle-patch (+1/-1)
diff.py (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

675. By Toshio Kuratomi on 2010-02-08

Allow bzr-handle-patch to handle patches with non-patch data.

674. By Andrew Starr-Bochicchio on 2010-01-29

Quick fix for Bug 512701. Adds help for ginit and gtags.

673. By Martin Albisetti on 2010-01-25

Fixes import. Debian bug #545730. (Mathias Brodala)

672. By Vincent Ladeuil on 2009-12-10

Thanks to lamont, we know spell Prettifying with the right number of 't'.

671. By Vincent Ladeuil on 2009-12-03

Hack around bzr.exe not supporting manual installations

670. By Vincent Ladeuil on 2009-12-02

Fix regressions in tests about merge being more strict by default.

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge)
(TestCommitDialog.test_pending_multiple): Since there are pending
merges, we should force the merge to avoid the UncommittedChanges
exception.

669. By Jelmer Vernooij on 2009-11-29

Merge code import fix.

668. By Jelmer Vernooij on 2009-11-29

Merge fixes to the desktop files.

667. By Jelmer Vernooij on 2009-11-22

Merge fix to allow finding elementtree on python2.4.

666. By Vincent Ladeuil on 2009-09-17

Catch-up with bzr.dev.

* __init__.py:
(COMPATIBLE_BZR_VERSIONS): Restore compatibility with bzr.dev.