lp:~vila/bzr-gtk/388790-windows-setup
Created by
Vincent Ladeuil
and last modified
- Get this branch:
- bzr branch lp:~vila/bzr-gtk/388790-windows-setup
Only
Vincent Ladeuil
can upload to this branch. If you are
Vincent Ladeuil
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Merged
into
lp:bzr-gtk/gtk2
- GuilhemBichot (community): Approve
- Alexander Belchenko: Approve
- Bazaar GTK maintainers: Pending requested
-
Diff: 31 lines (+14/-1)1 file modified__init__.py (+14/-1)
Branch information
Recent revisions
- 670. By Vincent Ladeuil
-
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. - 666. By Vincent Ladeuil
-
Catch-up with bzr.dev.
* __init__.py:
(COMPATIBLE_BZR_VERSIONS) : Restore compatibility with bzr.dev. - 662. By Vincent Ladeuil
-
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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)
- Stacked on:
- lp:bzr-gtk/gtk2