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

Re: How are (atomic) commits implemented?

From: Steve Williams <stevewilliams_at_kromestudios.com>
Date: 2005-07-20 03:48:18 CEST

KRONSTORFER Horst wrote:
> 'auto-merge' would also include that the changes made by the 1st commit are
> merged 'on the fly' into the local copy of the one who did the later commit?
>
> did you mean 'auto-merge' fail for *conflicting* changes to the same file.

If commit B changes a same file as commit A (anywhere in the same file,
not only the same lines), then the commit fails because they both
changed the same file. Committer B must then do an update to get the
changes committed by A, then try the commit again.

-- 
Sly
This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 20 03:49:06 2005

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