/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

  • Committer: Jan Hudec
  • Date: 2006-11-25 20:38:39 UTC
  • mto: (2199.1.1 jam-integration)
  • Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.

Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.

Simple test for this option is included.
Filename Latest Rev Last Changed Committer Comment Size
..
__init__.py 2052.3.1 19 years ago John Arbash Meinel Add tests to cleanup the copyright of all source f 1.3 KB Diff Download File
branch.txt 1996.3.18 19 years ago John Arbash Meinel Now that mkdtemp and rmtree are lazy, they should 988 bytes Diff Download File
transport.txt 1711.7.23 19 years ago John Arbash Meinel The api doc tests were using invalid paths on win3 769 bytes Diff Download File