Viewing all changes in revision 6437.77.2.

Committer: Patch Queue Manager
Date: 2013-05-30 12:53:09 UTC
mfrom: <a title="Merged From 6437.78.3" href="/~bzr-pqm/bzr/bzr.dev/revision/6437.78.3?remember=2241.1.4">(6437.78.3 2.5-merges-2.4)
mto: <a title="Merged In 6578.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6578.1.1?remember=2241.1.4">(6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6579 .
Revision ID: pqm@pqm.ubuntu.com-20130530125309-990eb4a5pn4sht37

(jameinel) Merge 2.4 into 2.5,
bringing in the fix for bug #855155 (Dirstate.update_basis_by_delta) (John A
Meinel)

added added

removed removed