Fix git-svn #18

Closed
wants to merge 1 commit into from

4 participants

@aroben

git-svn has been broken since c102f4c, which split some of git-svn into a separate Perl module.

@aroben aroben Fix git-svn in non-MakeMaker builds
c102f4c and
a618032 split some git-svn code into
separate modules, but forgot to inform the non-MakeMaker build about
those new modules.

Signed-off-by: Adam Roben <adam@roben.org>
98521f0
@aroben

Note that either of these two commits would be sufficient to fix the bug on its own. But it seemed good to be thorough.

@aroben

I decided not to put the switch to MakeMaker in this PR, as it has some ripple effects.

@aroben aroben referenced this pull request in github/msysgit Jun 15, 2012
Closed

Fix git-svn #7

@hvoigt
MSysGit - the development behind Git for Windows member

Minor nit: In your commit message you say: "c102f4c and a618032 split some git-svn code into...". IMO it would be nicer to read: "Commit c102f4c and a618032 split some git-svn code into...". Could you also correct the linewrapping to fill up around 73 characters?

@hvoigt
MSysGit - the development behind Git for Windows member

Double posting again? Please don't do that! I can see the same change discussed on the upstream mailinglist:

http://thread.gmane.org/gmane.comp.version-control.git/200071

We are merging from there and will have to handle the merge conflicts. If you discuss it upstream please mention it in the pull request. Closing this so it will not accidentially be merged and the next person packaging a version annoyed by a conflict.

@hvoigt hvoigt closed this Jun 16, 2012
@sschuberth
MSysGit - the development behind Git for Windows member

@hvoigt Thanks for spotting the upstream discussion.

@aroben I would even go one step further: In general we are not interested in pull requests that duplicate upstream changes. That would simply generate unnecessary work. But thank you for the upstream fix, of course!

@aroben

I didn't know I would be sending the changes upstream when I made this pull request. I guess I should have closed it after doing so. Sorry for the trouble!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment