/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Jan Hudec
  • Date: 2006-11-25 20:38:39 UTC
  • mto: (2199.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2200.
  • 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
    * WSGI-compatible HTTP smart server.  See ``doc/http_smart_server.txt``.
24
24
      (Andrew Bennetts)
25
25
 
 
26
    * ``bzr merge`` now has an option ``--pull`` to fall back to pull if
 
27
      local is fully merged into remote.
 
28
 
26
29
  INTERNALS:
27
30
 
28
31
    * New -D option given before the command line turns on debugging output