← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Vincent Ladeuil
  • Date: 2011-07-05 09:12:52 UTC
  • mto: (5050.77.1 2.2) (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110705091252-7qpkbzgr4wyrvwvq
https://launchpad.net/bugs/805809
Handle path conflicts involving different root-ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
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