lp:~vila/bzr/2.1.0-fixes
Created by
Vincent Ladeuil
and last modified
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.
- Robert Collins (community): Approve
-
Diff: 183 lines (+88/-17)5 files modifiedNEWS (+3/-0)
bzrlib/merge.py (+12/-2)
bzrlib/tests/__init__.py (+1/-1)
bzrlib/tests/test_merge.py (+67/-10)
bzrlib/tests/test_merge_core.py (+5/-4)
- bzr-core: Pending requested
-
Diff: 272 lines (+88/-29) (has conflicts)6 files modifiedNEWS (+28/-0)
bzrlib/chk_map.py (+35/-14)
bzrlib/fetch.py (+1/-1)
bzrlib/merge.py (+12/-2)
bzrlib/tests/test_chk_map.py (+6/-6)
bzrlib/tests/test_merge.py (+6/-6)
Related bugs
Bug #515597: TypeError: merge_text() takes exactly 2 arguments (3 given) | Critical | Fix Released |
|
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr