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

Re: 2 users working on same file caused a change to be reverted rather than merged

From: Toby Thain <toby_at_telegraphics.com.au>
Date: Sat, 14 Feb 2009 13:35:12 -0500

On 14-Feb-09, at 10:30 AM, Matthieu Moy wrote:

> Rupert Hunt <rupert_at_pagedevelopers.com> writes:
>
>> Does anyone know why this might have happened?
>
> The usual mistake is :
>
> Alice opens file.txt in her editor.
>
> Bob opens file.txt in his editor.
> Bob edits, and commits.
>
> Alice runs "update" outside her editor.
> Alice saves the file to disk, overwritting "update"'s changes.
> Alice commits. :-(.

That's right. It's important to use an editor which recognises when
the file changes under it (e.g. BBEdit on MacOS, or Eclipse/Subclipse
on any platform).

--Toby

>
> --
> Matthieu
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?
> dsForumId=1065&dsMessageId=1158433
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_subversion.tigris.org].

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1159309

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-14 19:36:10 CET

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