Andy Peters wrote:
> On Nov 8, 2006, at 1:58 AM, Robert Graf-Waczenski wrote:
>
>
>> Subversion, OTOH, by default uses the "Copy-Modify-Merge" pattern,
>> which
>> has some downsides on first glance if you are used to the VSS
>> patterns.
>> With the Subversion pattern, the user is not notified about changes by
>> others until the user *commits* his own changes.
>>
>
> To be completely clear: the user is not notified about changes
> committed by others until after the user attempts to commit his own
> changes. If any changes were made, there's a conflict and the user
> has to resolve it before he's allowed to commit his changes.
I'm not sure that's completely clear: there may be changes in the repos
that require an update, but doing an update may successfully merge them
into the user's code. Usually saying there's a "conflict" means that
the automatic merge was unsuccessful.
Duncan Murdoch
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 9 04:40:56 2006