lp:~vila/bzr-gtk/388790-windows-setup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-gtk/gtk2

GuilhemBichot (community): Approve on 2009-12-02

Alexander Belchenko: Approve on 2009-12-02

Bazaar GTK maintainers: Pending requested 2009-12-02

Diff: 31 lines (+14/-1)

1 file modified

__init__.py (+14/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

671. By Vincent Ladeuil on 2009-12-02

Patch as proposed on https://bugs.edge.launchpad.net/bzr/+bug/388790

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.

665. By Vincent Ladeuil on 2009-08-25

Open 0.97.0 for development.

664. By Vincent Ladeuil on 2009-08-25

Prepare release 0.97.0.

663. By Vincent Ladeuil on 2009-08-25

(vila) Add emblem for ignored and unversioned files

662. By Vincent Ladeuil on 2009-08-25

Fix test failures.

* tests/test_commit.py:
(TestCommitDialog_Commit.test_commit_specific_files_with_messages,
TestCommitDialog_Commit.test_commit_messages_after_merge):
bzrlib.bencode is now stricter and raises TypeError if provided
with Unicode strings. Fix the tests that were too relax anyway.