[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn merge ignore whitespace not working v 1.4.6

From: James Lee <bookofjames_at_gmail.com>
Date: Wed, 21 May 2008 11:47:32 +0800

Hi,

When I tried to do an svn merge using the following:

svn merge -x -u -x -w -x -b -x --ignore-eol-style

I get a conflict, but when I used TortoiseSVN (1.4.8) to view the conflicts
(ignoring all spaces) it shows me no conflicts at all.

Anyone knows why is this so?

regards,
James
Received on 2008-05-21 05:47:57 CEST

This message: [ Message body ]
Next message: Pankaj Chawla: "Commit Failed: SVN: <working copy>/build is not under version control"
Previous message: Les Mikesell: "Re: Exporting/Importing to Multiple Repositories"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.