lp://staging/~jameinel/bzr/2.0-40412-show-base-weave
Created by
John A Meinel
and last modified
Only
John A Meinel
can upload to this branch. If you are
John A Meinel
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Merged
into
lp://staging/bzr
- Vincent Ladeuil: Needs Fixing
-
Diff: 514 lines (+341/-39)6 files modifiedbzrlib/merge.py (+36/-24)
bzrlib/tests/blackbox/test_merge.py (+16/-0)
bzrlib/tests/test_merge.py (+112/-0)
bzrlib/tests/test_merge_core.py (+46/-14)
bzrlib/versionedfile.py (+55/-1)
plan_to_base.py (+76/-0)
Related bugs
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://staging/bzr