[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: Mark Phippard <markp_at_softlanding.com>
Date: 2006-07-28 21:27:51 CEST

news <news@sea.gmane.org> wrote on 07/28/2006 03:19:45 PM:

> Mark Phippard wrote:
> > No, sharing a project creates a folder for the project in the
repository
> > and then checks it out. That puts the folder at r1. Now you commit
files
> > in r2. The folder is still at r1.
>
> Why is it still at r1? So after sharing a project and adding and commit
> files in it, part of my project is at r2 and part of my project is at
> r1? That is somehow inconvenient. If I share a project through the Share
> Project wizard and commit files as part of this process then I would
> expect to continue any operation after that without any error message.

We could add an update to the end of the Share Project process but that is
only one scenario. As soon as you do one more commit you are back in the
same situation.

> Mark, you see my point? It is the user experience that needs improving
> here. It might be 100% correct behavior technically (from a Subversion
> WC perspective) but it is incorrect (or at least inconvenient) behavior
> for an end-users. As an end-user I don't want to deal with output in the
> console and error messages in the console.

In this case, I do not see your point. If you want to use Subversion it
is your reponsibility to learn something about it. The only way we could
"solve" this problem would be to issue an update on your project after
every commit. That is not a option that is even worth considering.

I view this as the equivalent of complaining to the CVS developers that
your network connection went down in the middle of a commit and part of
succeeded and part of it did not. Or that you were applying a label and
someone did a commit in the middle of the process and there code got
included in the label and you did not want it. Those are just facts of
life with using CVS. This is one of the ones with Subversion. In this
case, I do not think it is a problem though. How could any disconnected
SCM tool manage folder versions and not have this issue?

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jul 28 21:29:03 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.