← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
79
79
* ``bzr remove-tree`` can now remove multiple working trees.
80
80
  (Jared Hance, Andrew Bennetts, #253137)
81
81
 
 
82
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
 
83
  the kept file on content conflicts where one side deleted the file.
 
84
  (Vincent Ladeuil, #529968)
 
85
 
82
86
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
83
87
  of ``backup.bzr``. This directory is ignored by bzr commands such as
84
88
  ``add``.