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/shelf.py
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-12-01 00:10:04 UTC
- mfrom: (4798.6.3 fix-190096)
- Revision ID: pqm@pqm.ubuntu.com-20091201001004-vflb5bqsnrlkfh7p
Including a discussion of revert --forget-merges as a tool for
advanced merging. (Neil Martinsen-Burrell, #190096)
advanced merging. (Neil Martinsen-Burrell, #190096)
- 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
