Re: how to resolve conflicts in linux client?

On Tuesday 05 October 2010, ChrisF wrote:
> [...] 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

That is wrong as it stands, even though you might mean the right thing. SVN,
not just TSVN, will always try to merge changes.

> (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

Actually I do get the same in TSVN. The big difference is how much interactive
the two clients behave, TSVN makes it rather easy to resolve conflicts by
just discarding either set of changes.

> -- 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...

What I'm wondering here is why you have those conflicts. My guess is that you
are versioning generated files, which is often a bad idea, and that those
files contain timestamps, local paths etc which changes depending on the
developer or even WC location.

Otherwise, you mention you are on the commandline, so you could write a shell
script to revert all files who's changes can be discarded:

  #!/bin/bash
  svn revert file1.obj
  svn revert program.exe

etc, I hope you get the idea. However, this is really drifting off-topic now,
and I guess that a description of what exactly you want and why you want it
to the SVN mailinglist might turn up better suggestions.

Good luck!

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2668085
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].