Madan U Sreenivasan writes:
> On Thu, 15 Jun 2006 07:51:27 +0530, Ben Collins-Sussman
> <sussman@red-bean.com> wrote:
>
> [snip]
> >
> > A transaction starts life as a copy of the latest revision tree. You
> > make changes to the transaction tree, then attempt to commit it. If
> > newer changes have been committed in the meantime, the repository
> > attempts to merge your changes with the new changes. This the dumbest
> > sort of merge: if nobody else has changed the same files you're
> > changing, then there's no conflict, and the commit succeeds.
>
> IIUC, conflicts are much more fine grained... conflicts arise not simply
> because the same file is changed, but more specifically because the lines
> that have been changed are conflicting...
>
You're confusing conflicts on the client side (in the working copy) with
conflicts on the server side. What sussman was talking about was the latter.
Merging file contents is not done when committing a transaction.
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 15 13:02:20 2006