Viewing all changes in revision 4797.3.20.
- Committer: John Arbash Meinel
- Date: 2009-11-16 20:52:38 UTC
- mfrom: (4789.20.3 2.1.0b3-glob-updates)
- mto: This revision was merged to the branch mainline in revision 4800.
- Revision ID: john@arbash-meinel.com-20091116205238-dxub89y5jt5foo6y
Include the glob updates.
Technically this wasn't approved, but the tests pass, it adds tests on Linux,
and the timeout for review has certainly passed. I'm also not worried as it
is primarily a test-suite fix.
Technically this wasn't approved, but the tests pass, it adds tests on Linux,
and the timeout for review has certainly passed. I'm also not worried as it
is primarily a test-suite fix.
- files added:
- bzrlib/textui.py
- files removed:
- MANIFEST.in
- bzrlib/help_topics/es
- contrib/debian
- 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/conflicts.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- Makefile
expand all
collapse all
added
removed
