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

  • Committer: Patch Queue Manager
  • Date: 2011-12-21 15:32:34 UTC
  • mfrom: (6388.1.8 merge-hooks)
  • Revision ID: pqm@pqm.ubuntu.com-20111221153234-kbq1axff8pe224vt
(jelmer) Add pre_merge and post_merge hooks in Merger.hooks. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.5.txt
36
36
 
37
37
* New HPSS call for ``Repository.reconcile``. (Jelmer Vernooij, #894455)
38
38
 
 
39
* Merge now has two new hooks ``pre_merge`` and ``post_merge``
 
40
  that are called before and after a merge and can make
 
41
  additional modifications to the trees involved.
 
42
  (Jelmer Vernooij, #906877)
 
43
 
39
44
* Override the value returned by ``sys.getfilesystemencoding()`` for the bzr
40
45
  script to utf-8 when it would otherwise be ascii on a posix system. This
41
46
  will mean bzr works with non-ascii files when no locale or an incorrect