[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: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Thu, 30 Oct 2008 10:10:50 +0000

andersod2 wrote:
> 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.

Firstly, committing will never cause a conflict. It will either fail or
succeed, so you can always try to commit without worry of your files
getting modified.

Updating a file that's modified locally and remotely will always cause a
merge or a conflict.

Are you asking if there's a way to prevent locally modified files from
being updated when updating the tree? I can't think why you would want
to do this because
1) if the files that end up being updated are not related to the ones
you're working then surely your not that interested in updating that
2) if the files that end up being update ARE related to the ones your
working on, then by not accepting updates to certain files surely you
are creating compatibility issues

but, if you do want to selectively update files, go to "check for
modifications", then click "check repostiory" - you can see which files
have been changed both locally and remotely, and you can selectively
choose which ones to update. Also, if you click on a potentially
conflicted file in that list and select "compare with base", Tortoise
merge will tell you whether or not there are conflicts or whether a
merge will succeed.

Note that if you only ever do selective file updates in this manner then
over time your working copy becomes very "mixed revisions" even if all
the objects are fully up to date they have different base revisions (not
to be confused with last-commit revisions). This slows the client down
and makes the history in copy operations (branching and tagging) appear
more complicated than it neccessarily is. You should do an update on
the whole tree every so often to prevent this.

HTH - PS sorry I don't know clearcase so I might have missed the context

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 11:11:42 CET

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.