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

how to resolve conflicts in linux client?

From: ChrisF <thechrisanderson_at_gmail.com>
Date: Mon, 4 Oct 2010 17:41:15 -0700 (PDT)

Hi,

Technically this is not about tortoise, but does have to do with the
differences in results I get between tortoise and the svn linux client
on redhat. In tortoise, when I do an svn update, any local changes I
have made to a file will put that file into a changed state, and as
such that file will get ignored in the update (i.e. only the non-
changed files will get updated, and tortoise will notify me of the
conflict - sorry if I'm oversimplifying). I take it this is unique to
tortoise, because on the linux client, if I do an svn update in the
same situation, I will get a conflict file instead -- this is very
troubling in our situation wherein we have a lot of conflicts we would
like to ignore so we end up having to go back and delete those files
before doing the update. We would like to have it work on linux the
same as tortoise (i.e. just ignore those files, don't try to update
them), but are not sure how to accomplish this from the command
line...

sorry I know this is more about the linux client, but was hoping
someone here would know.

TIA and sorry for off-topic

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2667950

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-05 02:41:25 CEST

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

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