Hi Xisco, Hi Norbert, all, I migrated the feature/gsoc2011_wizards branch from components to core. While that should have been a simple "git format-patch"/"git am" combo with a bit of manual fudging for the merge commits:
9e91dbca08056fc31f388f5642fdfa3d2b910990 e52421bc118e9c5f3fce5a32ba9efdcad7627d92 It unfortunately turned out to be a bit more, mostly because of commits from the components repo: 002da0a3abe9e60f5c07105839b53008182f171a 811df4a1faed5f6b6527c6cbd34f3dd720ecfcfc a17a95aeab757e35240c7cbfd720b9586f1422ee 7e87b3f97b9ccb83dbe70fc213cdda50718225f2 d32fd9c1046b42da3d0d4141047aed8bd4f6d481 7f8fd4372bba6fde150d32ad07ca96b032d077e1 0245c6d17aa378e2d563ce0a50ee8ce14517f195 d9a8459a5e80e648440a71a245809736b77b88e1 7d23e260cce288878b61e78a1db523b7678ba299 to the branch, which seem to have been manually applied or copied/cherrypicked from master (Why? Esp. since most seem to be trivial and unrelated nonvital changes). These failed to apply, so I copied the dirstate of touched files after the commit from the old repo over to the new repo commit. This likely re-introduced "broken" whitespace (i.e. unfixed by Norberts whitespace fixer). Anyway: feature/goc2011_wizards in core now has the same dirstate in wizards as it had in components (modulo some missing linefeeds before EOF which where automagically fixed). As for the "broken" whitespace reintroduction: The whitespace fixer should be run again over all files touched by commits(*): 7bd40550a45e1013efaeec0a93ab152329254fc1 1cf8feb7da1b3188e0800e3f46abe9cfab55114b d3318788b34f6c570dff9f3a969ab4182f127b0e 326324dd764385d21754aaa2e7fc196386eb4729 0234a75db73b215d5212d140f6346d6842364ae4 34390079fef2c02bc2bf0b1c336759afb49a7477 583e72a8c49d3eee7679056f9b0178002e39f54a efc03133b105af9e4b16e2f4b8797395f0ba6fde d9db3380ec68c367955234f32ec66e2f6c9850d0 before the branch gets merged to master, so that we dont make master dirty again by that. Best, Bjoern (*) which are the corresponding commits to those mentioned above in the core repo -- https://launchpad.net/~bjoern-michaelsen _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
