« back to all changes in this revision
Viewing changes to bzrlib/tests/blackbox/test_conflicts.py
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-08-28 09:22:17 UTC
- mfrom: (3654.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20080828092217-98wmtek2p8cie8sc
(vila) Fix bug #225020 by catching CURLE_SEND_ERROR
- files added:
- bzrlib/_walkdirs_win32.h
- bzrlib/util/configobj/docs
- files removed:
- bzrlib/_annotator_py.py
- bzrlib/filters
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/tests/ftp_server
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_repository_chk
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- doc/ru
- doc/ru/mini-tutorial
- doc/ru/quick-reference
- doc/ru/tutorials
- doc/ru/user-guide
- doc/ru/user-guide/images
- tools/packaging
- files renamed:
- bzrlib/_btree_serializer_pyx.pyx => bzrlib/_btree_serializer_c.pyx
- bzrlib/_dirstate_helpers_pyx.h => bzrlib/_dirstate_helpers_c.h
- bzrlib/_dirstate_helpers_pyx.pyx => bzrlib/_dirstate_helpers_c.pyx
- bzrlib/_knit_load_data_pyx.pyx => bzrlib/_knit_load_data_c.pyx
- bzrlib/tests/ftp_server/medusa_based.py => bzrlib/tests/ftp_server.py
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/util/_bencode_py.py => bzrlib/util/bencode.py
- doc/en/developer-guide/HACKING.txt => doc/developers/HACKING.txt
- doc/developers/testing.txt => doc/en/developer-guide/testing.txt
- doc/es/developer-guide/ => doc/es/guia-desarrollador/
- doc/es/user-guide/ => doc/es/guia-usuario/
- doc/es/release-notes/ => doc/es/notas-version/
- doc/es/quick-reference/ => doc/es/referencia-rapida/
- doc/es/quick-reference/quick-start-summary.svg => doc/es/referencia-rapida/referencia-rapida.svg
- doc/es/user-reference/ => doc/es/referencia/
- tools/generate_docs.py => generate_docs.py
- bzrlib/doc_generate/ => tools/doc_generate/
- files modified:
- .bzrignore
added
removed
bzrlib/tests/blackbox/test_conflicts.py
