Viewing all changes in revision 5345.1.26.
- Committer: Vincent Ladeuil
- Date: 2010-08-29 14:32:45 UTC
- mfrom: (5345.5.13 lockable-config-files)
- mto: (5394.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5395.
- Revision ID: v.ladeuil+lp@free.fr-20100829143245-4kxyfllpt2xdfxg3
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
- files removed:
- bzrlib/controldir.py
- files renamed:
- bzrlib/tests/per_controldir/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/per_bzrdir/test_bzrdir.py
- bzrlib/tests/per_controldir_colo/ => bzrlib/tests/per_bzrdir_colo/
- files modified:
- Makefile
expand all
collapse all
added
removed
