Check-ins for 3.2

I did rename AutoExecGKC to StartupGlobalKeyCommand, in trunk@7954.

Thus spake pgeerkens:

I could use a good word with Joel to get this into the trunk sooner than
later. (And I did 90% of the heavy lifting last weekend bringing my branch
up-to-date with everything you and he have done in the trunk up to Sunday
night.)

I’m making (slow) progress on this. I now have 7842, 7899, 7906, 7922,
and 7930 committed to an integration branch so I can see what the
changes amount to. Trying see what’s changed has convinced me that SVN’s
diff is crap.


J.

Remember to ignore white-space changes. Are any of these diff’s really much
different than those of 25 years ago. I remember there being some settings
that could affect the conciseness, or not, of the analysis.

Pieter

-----Original Message-----
From: messages-bounces@vassalengine.org
[mailto:messages-bounces@vassalengine.org] On Behalf Of Joel Uckelman
Sent: Tuesday, November 01, 2011 7:11 PM
To: messages@vassalengine.org
Subject: Re: [messages] [Developers] Re: Check-ins for 3.2

Thus spake pgeerkens:

I could use a good word with Joel to get this into the trunk sooner
than later. (And I did 90% of the heavy lifting last weekend bringing
my branch up-to-date with everything you and he have done in the trunk
up to Sunday
night.)

I’m making (slow) progress on this. I now have 7842, 7899, 7906, 7922, and
7930 committed to an integration branch so I can see what the changes amount
to. Trying see what’s changed has convinced me that SVN’s diff is crap.


J.

Thus spake pgeerkens:

Remember to ignore white-space changes. Are any of these diff’s really much
different than those of 25 years ago. I remember there being some settings
that could affect the conciseness, or not, of the analysis.

The problem was/is not the diff format—I read diffs every day—but
that it seemed like the base for the diffs of files which were new to
my working copy was not my working copy, but rather some intermediate
state in the four changesets I merged. Hence, I was seeing as part of
the trailing and leading context code I’d never seen before, because
one of the other (earlier?) changesets introduced it. Strange.


J.