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

Re: question regarding conflict check-ins

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Thu, 30 Oct 2008 14:19:14 +0100

On Thursday 30 October 2008, andersod2 wrote:
> [...] when I attempt to do this in tortoise, I am not only told
> which files conflict, but all of a sudden those files have been
> modified and I have to now go back into the directories (of many
> files) and start renaming stuff or editing text which is a major
> pain.

When pulling changes from the repository, they will either be merged or cause
conflicts. If they cause conflicts, you can still select to "resolve using
mine" to just ignore the changes. However, you then face the danger that
related changes in different files are partially applied only.

> Is there any way to set up tortoise so that an update or commit will just
> fail and do nothing but reveal a conflict rather than causing your files
> to get modified?

No, unfortunately not (yet). I seem to remember that this was asked not too
long ago on the SVN mailinglist, too, odds are that someone will implement it
eventually. What you can do for now is to check for updates (TSVN offers this
via the contextmenu) and, what you should do anyway when you are involved
with a project, watch the commits, so that you have an idea of what changed.

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH
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.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-30 14:19:26 CET

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