Viewing all changes in revision 1551.2.52.
- Committer: abentley
- Date: 2006-04-20 23:47:53 UTC
- mfrom: (1681 +trunk)
- mto: This revision was merged to the branch mainline in revision 1683.
- Revision ID: abentley@lappy-20060420234753-6a6874b76f09f86d
Merge bzr.dev
- files added:
- bzrlib/tests/blackbox/test_merge.py
- bzrlib/transport/http
- files renamed:
- bzrlib/tests/test_uncommit.py => bzrlib/tests/blackbox/test_uncommit.py
- bzrlib/tests/test_basis_inventory.py => bzrlib/tests/workingtree_implementations/test_basis_inventory.py
- bzrlib/transport/http.py => bzrlib/transport/http/__init__.py
- files modified:
- BRANCH.TODO
expand all
collapse all
added
removed
