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

Re: [Subclipse-users] 1.1.4: Merge conflict during commit in freshly shared project

From: Gunnar Wagenknecht <gunnar_at_wagenknecht.org>
Date: 2006-08-01 02:49:37 CEST

Mark Phippard wrote:
> My point being that you are going to run into this problem no matter what
> we do because that is how Subversion works and we cannot issue an update
> after every commit. Adding an update at the end of Share Project just
> does not seem like it is really fixing anything.

I think that we may have an improvement for Subversion here. As you
might know, I have a ClearCase background. ;) We have the exact same
problem with ClearCase Snapshot views. Basically, a directory is
modified whenever you add, remove oder rename a file in it. If your
Snapshot view was not at HEAD (i.e. LATEST) when you made the
modification you got the same problem on commit (i.e. check-in).

However, ClearCase is a little bit more user friendly in that case.
Instead quiting with an unhelpful error message it brought up the Merge
Manager to merge the change with the LATEST version of the directory and
check-in thereafter.

Mark, do you see any chance that this can happen in Subclipse and/or any
other Subversion client?

Would it be possible to catch this error in a Subversion client and
update just the directory object to HEAD (without updating it
recursively), merge the change and commit (if the commit is plausible)?

Cu, Gunnar

Gunnar Wagenknecht
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Aug 1 02:50:11 2006

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

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