/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 1887.1.1 19 years ago Adeodato Simó Do not separate paragraphs in the copyright statem 1 KB Diff Download File
autodoc_bash_completion.py 1861.2.8 19 years ago Alexander Belchenko More branding: bazaar-ng -> Bazaar; bazaar-ng.org 1.5 KB Diff Download File
autodoc_man.py 1857.1.19 19 years ago Aaron Bentley Merge bzr.dev 6.3 KB Diff Download File
autodoc_rstx.py 1558.16.5 19 years ago Aaron Bentley Moy: change BZREMAIL to BZR_EMAIL 6.3 KB Diff Download File