Re: git-svn SVN 1.7 fix, take 2

[Jonathan Nieder <jrnieder@gmail.com>]

Hi again,

Michael G Schwern wrote:
> On 2012.7.24 3:02 PM, Jonathan Nieder wrote:

>> Could you send the first five patches that *are* supposed to have a
>> functional effect?  I know that they will not apply cleanly to git-svn
>> from git "master" or on top of each other; that's fine with me.  If
>> the approach looks right, interested people (read: probably Ben or I :))
>> can make the corresponding change in the code layout from "master".
[...]
> I think that would be a lot of extra work for me, create a big mess and be
> harder to understand. :-/
>
> Since I'm creating new files to store the classes, the functional changes
> cannot be applied without the class extractions, so I'd have to rewrite them.

I don't understand.  Didn't I ask to send the changes as-is and say
that *I or someone else interested* would do the work to get them to
apply?

[...]
> That should give you the information you need... if I understand what you
> need.  I feel like I don't and we're talking past each other.

Basically, you are offering a code fix that's at least worth $500.
Lots of people have wanted the bug fixed for a long time.  As long as
it does not involve sacrificing maintainability, we should apply the
fix as soon as possible!  It's great that you've done this work.

Meanwhile that change is being held hostage by lots of cleanups that
are unquestionably going in the right direction but are going to be a
pain in the neck to safely apply.  And no one has reviewed your fix
that comes _after_ the cleanups.  Maybe the fix goes in a wrong
direction --- we don't know yet.  Maybe once we understand the fix
we'll have ideas that obsolete the previous cleanups and can more
simply accomplish the same thing by organizing the code a different
way.

You are saying that, to make your life easier, we should take your
cleanups and fixes as-is, all in one big pull.  Maybe you're right!
But it will take a lot longer this way than applying a smaller set of
changes that just fixes the bug.

I am saying that that, before anything else, it would be helpful for
us to *see* the relevant patches and understand your fix.  You are
more knowledgeable than anyone else about your code, so presumably it
should be straightforward to pick out which patches are the important
ones.  Using "git format-patch -1 <commit>" you can get a patch for
each.  Then you can use your favorite text editor to edit their
subject lines and change descriptions to describe what they do and
where they fall in the series of patches you are sending.  Finally you
can use your favorite mail user agent (e.g., "git send-email") to send
out the patches.

Jonathan