From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 100591 invoked by alias); 19 Mar 2015 11:55:14 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Received: (qmail 100579 invoked by uid 89); 19 Mar 2015 11:55:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=3.0 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,KAM_FROM_URIBL_PCCC,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-la0-f44.google.com Received: from mail-la0-f44.google.com (HELO mail-la0-f44.google.com) (209.85.215.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 19 Mar 2015 11:55:12 +0000 Received: by ladw1 with SMTP id w1so59910414lad.0 for ; Thu, 19 Mar 2015 04:55:09 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.152.219.2 with SMTP id pk2mr67533830lac.107.1426766109312; Thu, 19 Mar 2015 04:55:09 -0700 (PDT) Received: by 10.114.77.42 with HTTP; Thu, 19 Mar 2015 04:55:09 -0700 (PDT) In-Reply-To: References: <5509C7DB.4040708@tiscali.co.uk> Date: Thu, 19 Mar 2015 13:18:00 -0000 Message-ID: Subject: Re: Cygwin svn vs. TortoiseSVN? From: Jan Nijtmans To: cygwin@cygwin.com Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00330.txt.bz2 2015-03-19 10:55 GMT+01:00 Csaba Raduly : > Using both Cygwin svn and TortoiseSVN on the same repo is problematic. > Even if you don't run into locking problems, the "native" line-ending > differs (Cygwin's svn uses LF, TortoiseSVN uses CR LF). I've had these > problems in the past :( Me too, but it is very well workable with the following two measures: - Change the svn "config" and "servers" files to being hyperlinks to the windows version of those file. For example: $ pwd /home/nijtmaj/.subversion $ ls -la total 14 drwxr-xr-x+ 1 nijtmaj None 0 Mar 19 12:20 . drwxr-xr-x+ 1 nijtmaj None 0 Mar 3 17:12 .. drwx------+ 1 nijtmaj None 0 Nov 14 2013 auth lrwxrwxrwx 1 nijtmaj None 59 Mar 19 12:20 config -> /cygdrive/c/Users/nijtmaj/AppData/Roaming/Subversion/config -rw-r--r-- 1 nijtmaj None 4276 Nov 14 2013 README.txt lrwxrwxrwx 1 nijtmaj None 60 Mar 13 2014 servers -> /cygdrive/c/Users/nijtmaj/AppData/Roaming/Subversion/servers This way, the settings for cygwin and win32 are always consistant. (maybe it works for the "auth" directory as well, didn't try/need that) - Never user svn:eo-style=native, always either svn:eo-style=LF or svn:eo-style=CRLF This way, it works very well for me. Regards, Jan Nijtmans -- Problem reports: http://cygwin.com/problems.html FAQ: http://cygwin.com/faq/ Documentation: http://cygwin.com/docs.html Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple