~bzr-pqm/bzr/bzr.dev

Committer: Vincent Ladeuil
Date: 2011-07-05 11:54:54 UTC
mfrom: <a title="Merged From 5050.77.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5050.77.2?remember=6588.1.1">(5050.77.2 2.2.5-dev)
mto: <a title="Merged In 5609.48.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5609.48.2?remember=6588.1.1">(5609.48.2 2.3)
mto: This revision was merged to the branch mainline in revision 6013 .
Revision ID: v.ladeuil+lp@free.fr-20110705115454-hg9s5ip3sqm3uqek

Merge 2.2 into 2.3

added added

removed removed

doubly-stacked branch.

(James Westby, Martin Pool, #715000)

* Don't crash while merging and encountering obscure path conflicts

involving different root-ids. (Vincent Ladeuil, #805809)

Improvements

************