From: Graham Percival <g.1@re...> - 2011-03-01 13:08:06
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:
... 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... :)