Re: Question about concurrent commits

Kevin Pilch-Bisson wrote:

> Hi again,
>
> I have just been perusing the interfaces in subversion/include/ and some
> of the desing docs, and I had a question about concurrent commits. What
> happens when two people are doing commits at the same time and both have
> modified the same file foo.c:17. Assuming one of them finishes first,
> their transaction is committed, and foo becomes foo.c:18. Then when the
> second person commits, their delta is against foo.c:17, but the latest
> copy in the repository is foo.c:18. From the way I interpreted the
> design docs, a situation like this will cause a branch in the repository
> at foo.c:17.
>
> Am I correct? Or is there some other way that this type of situation is
> handled?

If there's a conflict, the second commit will fail. You'll have to
update your working copy (merging any changes) and try again. There's
not much else to do.

Branching automagically like that would be weird, to say the least.

-- 
Brane �ibej
    home:   <brane_at_xbc.nu>             http://www.xbc.nu/brane/
    work:   <branko.cibej_at_hermes.si>   http://www.hermes-softlab.com/
     ACM:   <brane_at_acm.org>            http://www.acm.org/