>I played a bit with SVN and have to confess it impressed me. But since
>there is no edit-related commands I doubt whether it's ready for
>production usage? I mean how do developers work together w/o knowing
>that a file is "checked-out"? Maybe in the open-souce world it's not
>really important since exclusive lock doesn't exist but inside a team I
>can't rely on carefull manual merging (I mean I don't want to oblige
>people to ever think about it). How do you work it around? I saw
>edit-related commands are in the list far behind the release.
In the last three months of using subverion, we've had to do a manual merge
exactly once, on 3 source files out of approximately 1000. (that's 0.3%).
They were one-line conflicts, and the developer in question had not updated
his source in over a month.
The automated merge is typically extremely good (yet conservative) at
handling merges. Local changes are *never* overwritten by the repository.
Typically when two developers touch the same file at the same time, they
edit different parts; the automated merge handles this extremely common
case. You don't really have to know the other person is handling a specific
file.
I find that a daily update is sufficient for our team to have zero
conflicts. If a developer were to go on vacation without checking in, it
doesn't affect our code. This is a real benefit for us.
John C Barstow
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 8 22:37:11 2002