To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/missing.py
- Committer: John Arbash Meinel
- Date: 2009-10-15 04:01:26 UTC
- mfrom: (4734.3.1 2.1.0b1)
- mto: This revision was merged to the branch mainline in revision 4747.
- Revision ID: john@arbash-meinel.com-20091015040126-a0aeamcjsjeredvv
Merge the 2.1.0b1 branch.
Update NEWS to handle the various cases got shuffled around,
including moving 'in progress' stuff up into the current development
section.
Update NEWS to handle the various cases got shuffled around,
including moving 'in progress' stuff up into the current development
section.
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- bzrlib/tests/per_foreign_vcs
- contrib/debian
- doc/en/whats-new
- 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
- 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/missing.py
