← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.3.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-11 20:10:31 UTC
  • mfrom: (5588.3.1 cmd-modified-relocking)
  • Revision ID: pqm@pqm.ubuntu.com-20110111201031-0i87t0t3kyhitwv4
(spiv) Fix -Drelock warnings in cmd_modified. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.3.txt
35
35
  once.  This avoids some unnecessary IO, and removes a network roundtrip
36
36
  when doing ``bzr branch`` to a smart server URL.  (Andrew Bennetts)
37
37
 
 
38
* ``bzr modified`` now read-locks the working tree (and branch and
 
39
  repository) just once.  (Andrew Bennetts)
 
40
  
38
41
* ``bzr resolve`` now accepts ``--take-this`` and ``--take-other`` actions
39
42
  for text conflicts. This *replace* the whole file with the content
40
43
  designated by the action. This will *ignore* all differences that would