Merge in r15047 reverts some earlier commits

Bug #1669951 reported by su_v on 2017-03-04
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Inkscape
Undecided
Unassigned

Bug Description

The merge in r15047 contains several (what appear to be) unintended changes:

1) Some commits seem to have been fully reverted:

https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14955
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14978

This one was restored in r15563:
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15003

2) Some commits seem to have been partially reverted (only some of the changed files):

These were restored later in r15079:
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14956#share/tutorials/tutorial-tracing.fr.svg
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14956#share/tutorials/tutorial-tracing-pixelart.fr.svg
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14957#share/tutorials/tutorial-advanced.de.svg
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14957#share/tutorials/tutorial-basic.de.svg
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14957#share/tutorials/tutorial-shapes.de.svg

This one was not yet restored AFAICT:
https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14956#inkscape.fr.pod

TODO
====
Check for possibly more unintended changes in the merge which fully or partially revert older commits:
* Revision 15047: Merged gsoc work. Created better data structure for selections, replaced SPObject children list, improved spray tool, split tests to separate executables
http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15047

Related report
==============
* Bug #1668853 “Powerstroke LPE still hangs”
  https://bugs.launchpad.net/inkscape/+bug/1668853
Alvin first noticed one of the reverted commits (r15003) which reintroduced an earlier fixed issue (bug #1593963).
Earlier commit r15003 has now been restored in r15563.

This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers