Hi all, We think that the glasgow-pitchtracker-2009 branch is ready for merging. We've merged up to 12256. The diff is currently 202K, but that's a bit bigger than I was expecting. It was also a bit difficult to make the diff... <insert insults to svn and praise of git here>
There's a whole bunch of "property changed on XYZ" messages in the diff. I assume we can ignore those? There's also a few "added" files, which AFAIK aren't because of us: src/gui/widgets/CanvasGroupableItem.h src/gui/widgets/CanvasGroupableItem.cpp src/gui/editors/segment/TrackHeader.cpp src/gui/editors/segment/TrackHeader.h src/gui/general/CanvasCursor.h src/gui/general/RosegardenCanvasView.cpp src/gui/general/CanvasItemGC.cpp src/gui/general/CanvasCursor.cpp ... ok, I'm bored with copy&pasteing those names. I'd say that about 50% of the diff is due to files like these. Do you recognize those are files that were deleted recently? Maybe svn doesn't track file deletion when you merge from trunk into a branch? Anyway, there's totally no rush with this. Let us know how to proceed; I'm happy getting the changes to you any way you want -- just pointing you at the branch, or preparing a diff, or burning a dvd and sending it via international air mail... :) Cheers, - Graham ------------------------------------------------------------------------------ Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev _______________________________________________ Rosegarden-devel mailing list [email protected] - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
