« back to all changes in this revision
Viewing changes to doc/en/admin-guide/integration.txt
- Committer: Martin Pool
- Date: 2010-02-27 01:34:49 UTC
- mto: This revision was merged to the branch mainline in revision 5064.
- Revision ID: mbp@canonical.com-20100227013449-zxostilwfoendxfv
Handle "Directory not empty" from ftp as DirectoryNotEmpty.
FtpTransport._translate_ftp_error can handle all ftp errors; there's no clear
distinction between 'temporary' and 'permament'.
FtpTransport._translate_ftp_error can handle all ftp errors; there's no clear
distinction between 'temporary' and 'permament'.
- files added:
- MANIFEST.in
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/apport
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/whats-new
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- files removed:
- bzrlib/textui.py
- doc/en/developer-guide
- doc/es/developer-guide
- doc/es/release-notes
- doc/es/user-reference
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- bzrlib/tests/test_pack_repository.py => bzrlib/tests/per_pack_repository.py
- bzrlib/tests/test_versionedfile.py => bzrlib/tests/per_versionedfile.py
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- doc/en/developer-guide/HACKING.txt => doc/developers/HACKING.txt
- doc/en/quick-reference/Makefile => doc/en/_static/en/Makefile
- doc/en/quick-reference/quick-start-summary.pdf => doc/en/_static/en/bzr-en-quick-reference.pdf
- doc/en/quick-reference/quick-start-summary.png => doc/en/_static/en/bzr-en-quick-reference.png
- doc/en/quick-reference/quick-start-summary.svg => doc/en/_static/en/bzr-en-quick-reference.svg
- doc/es/quick-reference/Makefile => doc/es/_static/es/Makefile
- doc/es/quick-reference/quick-start-summary.pdf => doc/es/_static/es/bzr-es-quick-reference.pdf
- doc/es/quick-reference/quick-start-summary.png => doc/es/_static/es/bzr-es-quick-reference.png
- doc/es/quick-reference/quick-start-summary.svg => doc/es/_static/es/bzr-es-quick-reference.svg
- doc/index.es.txt => doc/es/index.txt
- doc/ru/quick-reference/Makefile => doc/ru/_static/ru/Makefile
- doc/ru/quick-reference/quick-start-summary.pdf => doc/ru/_static/ru/bzr-ru-quick-reference.pdf
- doc/ru/quick-reference/quick-start-summary.png => doc/ru/_static/ru/bzr-ru-quick-reference.png
- doc/ru/quick-reference/quick-start-summary.svg => doc/ru/_static/ru/bzr-ru-quick-reference.svg
- doc/index.ru.txt => doc/ru/index.txt
- files modified:
- .bzrignore
added
removed
doc/en/admin-guide/integration.txt
