← 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.4.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-07 10:56:19 UTC
  • mfrom: (6011.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110707105619-6tftefqyt2zlmho5
(vila) Merging unrelated trees prefers THIS root (Aaron Bentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.4.txt
142
142
  exception caused while running bzr serve.
143
143
  (Jonathan Riddell, #274578)
144
144
 
145
 
 
146
145
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
147
146
  and revision properties.  (Jonathan Riddell, #274578)
148
147
 
 
148
* Preserve existing ``root-id`` when merging an unrelated branch.
 
149
  (Aaron Bentley, #806356)
 
150
 
149
151
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
150
152
  ``missing`` commands. (Martin von Gagern, #38655)
151
153