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

question regarding conflict check-ins

From: andersod2 <thechrisanderson_at_gmail.com>
Date: Wed, 29 Oct 2008 23:04:30 -0700 (PDT)

I couldn't find the answer to this in the manual, so I apologize if
this is a repeat question. At my old workplace we were using
clearcase and it was set up so that when you attempted to check in an
out-of-date version it simply rejected the check-in until you resolved
the conflict. This was convenient because I could check in a whole
bunch of stuff and not worry about conflicts until they came back
rejected (i.e. all my conflicted files could be revealed and dealt
with during the check-in process). But 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. 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? Obviously this is
very inconvenient when you are attempting to check in a whole bunch of
files, or you want to be updating your build very often, but have to
keep going back to resolve conflicts on files you didn't want
touched.

Again, if I have missed something, please forgive my error.

---------------------------------------------------------------------
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 07:05:53 CET

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