/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
..
configobj 1185.12.49 20 years ago Aaron Bentley Switched to ConfigObj Diff
effbot 1185.1.29 20 years ago Robert Collins merge merge tweaks from aaron, which includes late Diff
elementtree 1185.1.29 20 years ago Robert Collins merge merge tweaks from aaron, which includes late Diff
__init__.py 1185.1.29 20 years ago Robert Collins merge merge tweaks from aaron, which includes late Empty Diff Download File