This is the mail archive of the
mailing list for the binutils project.
Re: A Proposal to Move to Git
- From: asmwarrior <asmwarrior at gmail dot com>
- To: Steinar Bang <sb at dod dot no>
- Cc: gdb at sourceware dot org, binutils at sourceware dot org
- Date: Wed, 28 Aug 2013 00:27:44 +0800
- Subject: Re: A Proposal to Move to Git
- Authentication-results: sourceware.org; auth=none
- References: <8738q4gj7a dot fsf at fleche dot redhat dot com> <201308222010 dot r7MKAljG013904 at glazunov dot sibelius dot xs4all dot nl> <87wqnda0tm dot fsf at fleche dot redhat dot com> <CAMe9rOr1ivRrGs2GtJU3cXgYJAzEx-wdatuzoY9NBDmh4jJqpg at mail dot gmail dot com> <20130823155534 dot GR5147 at adacore dot com> <C75A84166056C94F84D238A44AF9F6AD034C0C96 at AUSX10MPC103 dot AMER dot DELL dot COM> <CAMe9rOr6PgVZOvgstff0u2e-gdtP3R-Hc-H+8Gu+mvsNyenQrg at mail dot gmail dot com> <CAF1jjLsNzGBrtyZ=ZT_URqz1BLsH_=eNMZtSkxQwEqTOTFX+OA at mail dot gmail dot com> <upzc38pvcv1w dot fsf at dod dot no>
On 2013-8-27 18:00, Steinar Bang wrote:
>>>>>> NightStrike <email@example.com>:
>> ... Git users can easily use git-svn, which means you can satisfy
>> mostly everyone, and still be using current, well maintained software.
> git-svn is broken on the Win32 platform. It can get you a git checkout
> with the full history. The problems start when you wish to push your
> changes back into subversion. Then you have to either do a merge or a
> rebase against the branch tracking the remote subversion repository, and
> you end up getting a conflict in all files you have changes in.
> When I tried it, the conflicts with merge, were the entire files (which
> is pretty useless. With rebase and with merge using the
> ignore-space-change option, the conflicts were just my changed lines,
> but with CRLF/LF issues.
> Ie. I got a conflict on all of my changes whether they were a conflict
> or not.
> I tried switching off core.autocrlf in git and I tried convincing
> git-svn that the svn checkout shouldn't do CRLF/LF translation, but I
> had no luck with that.
> My experiments were in msysgit 1.8.3-preview20130601.
> (For the record: if someone have a procedure that can make this a
> non-issue I would be happy to be proved wrong)
I'm using the same msysgit and TortoiseGit, I can use git-svn without such conflict issue.
I can successfully commit changes to Codeblocks' SVN repo
http://sourceforge.net/projects/codeblocks/ by git-svn.
My setting of local git is: auto crlf is true, safe crlf is false.