/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 2089 19 years ago Canonical.com Patch Queue Manager (John Arbash Meinel) avoid circular imports by pro 7.4 KB Diff Download File
test_test_trees.py 2052.3.6 19 years ago John Arbash Meinel [merge] bzr.dev 2078 5.9 KB Diff Download File