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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-07 12:07:41 UTC
  • mfrom: (6012.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110707120741-pfagsqufrv57xoe1
(vila) Handle path conflicts involving different root-ids (merged in
 from 2.3 + tweaks) (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.2.txt
24
24
  doubly-stacked branch.
25
25
  (James Westby, Martin Pool, #715000)
26
26
 
 
27
* Don't crash while merging and encountering obscure path conflicts
 
28
  involving different root-ids. (Vincent Ladeuil, #805809)
 
29
 
27
30
Improvements
28
31
************
29
32