« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- Committer: Robert Collins
- Date: 2006-03-08 00:20:04 UTC
- mfrom: (1563.2.42 versioned-file-knit-stores)
- mto: (1596.2.3 integration) (1594.3.1 versioned-file-performance)
- mto: This revision was merged to the branch mainline in revision 1596.
- Revision ID: robertc@robertcollins.net-20060308002004-a9950b2fb75d14de
Merge in knit repository use of knits - still not a stable format, but can be experimented with.
- files added:
- bzrlib/inter.py
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- files removed:
- bzrlib/tests/test_reweave.py
- files renamed:
- bzrlib/store/weave.py => bzrlib/store/versioned/__init__.py
- files modified:
- BRANCH.TODO
added
removed
bzrlib/merge.py
