Felix Gilcher wrote:
> Gerco Ballintijn wrote on Dienstag, 21. November 2006 15:32:
>
>> You CANNOT commit to trunk when others have already committed
>> their changes, that is, when the BASE revision of your working copy
>> is no longer the HEAD!
>
> This is just wrong. See mixed revision working copies. The restriction
> is: you cannot modify in your commit any resource (be it file or
directory)
> that was modified after your last update of this resource. The following
> scenario will work just fine:
>
> Repository contains one directory (D) with two files (F1, F2).
>
> User A checks out D.
> User B checks out D.
> User A modifies F1 and commits.
> User B modifies F2 and commits.
>
> Note that A and B never modified the same resource.
>
Yep. Your right. I bow my head in shame...
The semantics of directories and files commit differ subtly. :-(
With regards,
Gerco.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 21 18:36:50 2006