« back to all changes in this revision
Viewing changes to bzrlib/tests/per_branch/test_reconcile.py
- Committer: Ian Clatworthy
- Date: 2009-09-01 01:25:37 UTC
- mfrom: (4634.6.13 2.0)
- mto: (4634.102.1 eol-update-bug)
- mto: This revision was merged to the branch mainline in revision 4857.
- Revision ID: ian.clatworthy@canonical.com-20090901012537-h9tavn0i6ih34qst
merge 2.0 branch rev 4647
- files added:
- bzrlib/_annotator_py.py
- doc/_static
- doc/_static/en
- doc/_static/en/quick-reference
- doc/_templates
- doc/en/upgrade-guide
- tools/win32/buildout-templates
- tools/win32/buildout-templates/bin
- files renamed:
- bzrlib/_btree_serializer_c.pyx => bzrlib/_btree_serializer_pyx.pyx
- bzrlib/_dirstate_helpers_c.h => bzrlib/_dirstate_helpers_pyx.h
- bzrlib/_dirstate_helpers_c.pyx => bzrlib/_dirstate_helpers_pyx.pyx
- bzrlib/_knit_load_data_c.pyx => bzrlib/_knit_load_data_pyx.pyx
- tools/doc_generate/ => bzrlib/doc_generate/
- bzrlib/tests/branch_implementations/ => bzrlib/tests/per_branch/
- bzrlib/tests/bzrdir_implementations/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/interrepository_implementations/ => bzrlib/tests/per_interrepository/
- bzrlib/tests/intertree_implementations/ => bzrlib/tests/per_intertree/
- bzrlib/tests/inventory_implementations/ => bzrlib/tests/per_inventory/
- bzrlib/tests/test_pack_repository.py => bzrlib/tests/per_pack_repository.py
- bzrlib/tests/test_transport_implementations.py => bzrlib/tests/per_transport.py
- bzrlib/tests/tree_implementations/ => bzrlib/tests/per_tree/
- bzrlib/tests/test_versionedfile.py => bzrlib/tests/per_versionedfile.py
- bzrlib/tests/workingtree_implementations/ => bzrlib/tests/per_workingtree/
- doc/en/quick-reference/Makefile => doc/_static/en/quick-reference/Makefile
- doc/en/quick-reference/quick-start-summary.pdf => doc/_static/en/quick-reference/bzr-quick-reference.pdf
- doc/en/quick-reference/quick-start-summary.png => doc/_static/en/quick-reference/bzr-quick-reference.png
- doc/en/quick-reference/quick-start-summary.svg => doc/_static/en/quick-reference/bzr-quick-reference.svg
- doc/es/guia-desarrollador/ => doc/es/developer-guide/
- doc/es/referencia-rapida/ => doc/es/quick-reference/
- doc/es/referencia-rapida/referencia-rapida.svg => doc/es/quick-reference/quick-start-summary.svg
- doc/es/notas-version/ => doc/es/release-notes/
- doc/es/guia-usuario/ => doc/es/user-guide/
- doc/es/referencia/ => doc/es/user-reference/
- generate_docs.py => tools/generate_docs.py
- files modified:
- .bzrignore
added
removed
bzrlib/tests/per_branch/test_reconcile.py
