[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Delete of a file/folder from 2 working copies

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2006-03-17 14:19:18 CET

On 3/17/06, Kamesh Jayachandran <kamesh@collab.net> wrote:
> Going through the subversion/libsvn_fs_base/notes/structure Merging
> Algorithm section
> "Else:
> Changes were made to this entry both within the transaction and
> to the repository while the transaction was in progress. They
> must be merged or declared to be in conflict.".
>
> Just thought of testing deleting and commiting same file/directory from
> 2 working copies in a sequence and see what the second commit reports back.
> I expected that second commit would report 'Out Of Date Error'
> unfortunately it is not, commit successfully goes through with a new
> revison, even though the only transactions and revision tables alone
> getting updated to my bdb repository not the changes and nodes.
>
>

I think this is expected. If you look at fs.c:merge(), two deletes of
the same thing are considered mergeable. So you end up creating a new
revision identical to the previous one, with no changed paths.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 17 14:20:21 2006

This is an archived mail posted to the Subversion Dev mailing list.