From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1010 invoked by alias); 27 Aug 2013 16:21:07 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 925 invoked by uid 89); 27 Aug 2013 16:21:07 -0000 Received: from mail-pd0-f176.google.com (HELO mail-pd0-f176.google.com) (209.85.192.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 27 Aug 2013 16:21:07 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=ALL_TRUSTED,BAYES_20,FREEMAIL_FROM,KHOP_THREADED autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-pd0-f176.google.com Received: by mail-pd0-f176.google.com with SMTP id q10so5070051pdj.21 for ; Tue, 27 Aug 2013 09:21:04 -0700 (PDT) X-Received: by 10.68.107.162 with SMTP id hd2mr22213347pbb.126.1377620464406; Tue, 27 Aug 2013 09:21:04 -0700 (PDT) Received: from [192.168.1.101] ([115.206.98.209]) by mx.google.com with ESMTPSA id mz5sm25562825pbc.18.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 Aug 2013 09:21:03 -0700 (PDT) Message-ID: <521CD380.8000002@gmail.com> Date: Tue, 27 Aug 2013 16:21:00 -0000 From: asmwarrior User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/17.0 Thunderbird/17.0a1 MIME-Version: 1.0 To: Steinar Bang CC: gdb@sourceware.org, binutils@sourceware.org Subject: Re: A Proposal to Move to Git References: <8738q4gj7a.fsf@fleche.redhat.com> <201308222010.r7MKAljG013904@glazunov.sibelius.xs4all.nl> <87wqnda0tm.fsf@fleche.redhat.com> <20130823155534.GR5147@adacore.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-08/txt/msg00127.txt.bz2 On 2013-8-27 18:00, Steinar Bang wrote: >>>>>> NightStrike : > >> ... 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. Yuanhui Zhang