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

Re: [Subclipse-users] Update before Commit ?

From: Javier Kohen <jkohen_at_users.sourceforge.net>
Date: 2007-10-24 15:41:52 CEST

El mié, 24-10-2007 a las 09:34 -0400, Kiran Karnati escribió:
> Hi,
>
> if the same class is checked out by two users and they both modify it
> and one of them check it in before, the second one can't overwrite
> it.
>
> He must update it before he can commit. That is a good feature which
> forces to download all changes made to repos, but even after merging
> all changes to the local copy and having local changes extra, he
> still ned to do update to be able to have commit option activated.

Update does not imply "update and override." The former does not
overwrite the local changes, the latter does. You might be missing the
"Mark conflicts solved" step after merge.

> This means , the second user loses all his changes he made to the local copy once he updates it.
>
> Is there any solution for this problem ?

You shouldn't be having this problem. That's one of the main reasons to
use a revision control system with merge support such as Subversion.
Review your procedure.

-- 
Javier Kohen <jkohen@users.sourceforge.net>
ICQ: blashyrkh #2361802
Jabber: jkohen@jabber.org

Received on Wed Oct 24 15:49:25 2007

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.