Merge lp:~jelmer/qbrz/trunk into lp:qbrz
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Merged at revision: | 1641 |
Proposed branch: | lp:~jelmer/qbrz/trunk |
Merge into: | lp:qbrz |
Diff against target: |
107 lines (+12/-13) 4 files modified
lib/diffwindow.py (+0/-4) lib/tests/test_annotate.py (+7/-4) lib/tests/test_treewidget.py (+0/-1) lib/treewidget.py (+5/-4) |
To merge this branch: | bzr merge lp:~jelmer/qbrz/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ladyman | Approve | ||
Review via email: mp+403345@code.launchpad.net |
Description of the change
Some compatibility fixes for Breezy 3.2.
This reduces the number of test failures, but there are still some remaining.
Breezy 3.2 has updated the APIs to discourage use of file ids
(which don't exist for non-bzr formats). qbrz should probably be updated
to use paths rather than file ids as well.
To post a comment you must log in.
Please go ahead and merge.
qbrz will need extensive changes I think - file ids are used throughout. ChangeDesc also has a different definition.