To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4889.
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-12-10 23:57:39 UTC
- mfrom: (4634.101.18 2.1-40412-show-base-weave)
- Revision ID: pqm@pqm.ubuntu.com-20091210235739-zwgaqsbb2mk57gyv
(jam) Teach bzr merge --weave/--lca how to create a .BASE file (bug
        #40412)
        #40412)
- 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
expand all
collapse all
added
removed
doc/en/_static/en/bzr-en-quick-reference.svg
doc/es/_static/es/bzr-es-quick-reference.svg
doc/ru/_static/ru/bzr-ru-quick-reference.svg
