lp://staging/~ingolemo/bzr-gtk/fix-for-LP333876
Created by
Ingolemo
and last modified
- Get this branch:
- bzr branch lp://staging/~ingolemo/bzr-gtk/fix-for-LP333876
Branch merges
Propose for merging
No branches
dependent on this one.
- Jasper Groenewegen (community): Approve
-
Diff: 57 lines (+9/-0)1 file modifiedolive/window.py (+9/-0)
Related bugs
Related blueprints
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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)
- Stacked on:
- lp://staging/bzr-gtk/gtk2