« back to all changes in this revision
Viewing changes to bzrlib/shelf.py
- Committer: Vincent Ladeuil
- Date: 2009-12-09 15:09:00 UTC
- mto: (4881.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4882.
- Revision ID: v.ladeuil+lp@free.fr-20091209150900-pbytmi9fh4fa3vbf
Fix broken test (fail on windows).
* bzrlib/tests/test_osutils.py:
(TestTerminalWidth.test_falls_back_to_COLUMNS): COLUMNS makes
sense for ttys only.
* bzrlib/tests/test_osutils.py:
(TestTerminalWidth.test_falls_back_to_COLUMNS): COLUMNS makes
sense for ttys only.
- files added:
- bzrlib/weave_commands.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/shelf.py
