← 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-25 09:38:23 UTC
  • mfrom: (5112.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100325093823-kwkh6crnkc0xfxh6
(vila) Better PathConflict resolution when a deletion is involved

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
141
141
* Fix stub sftp test server to call os.getcwdu().
142
142
  (Vincent Ladeuil, #526211, #526353)
143
143
 
 
144
* Path conflicts now support --take-this and --take-other even when a
 
145
  deletion is involved.
 
146
  (Vincent Ladeuil, #531967)
 
147
 
144
148
* Network transfer amounts and rates are now displayed in SI units according
145
149
  to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
146
150
  (Gordon Tyler, #514399)