On Jan 19, 2005, at 4:47 PM, Justin Erenkrantz wrote:
> --On Wednesday, January 19, 2005 12:13 PM -0600 Ben Collins-Sussman
> <sussman@collab.net> wrote:
>
>> ra_dav (just like ra_svn) needs to send an entire hash table in the
>> final
>> commit request. The tokens are used by svn_fs_commit_txn(), and the
>> locked paths are also potentially unlocked after the commit.
>
> You know, upon reflection and re-reading the RFCs, I'm not 100% sure
> that we *have* to send the locks at MERGE time. The reason is that
> the WebDAV locks are verified when we update the file in the activity
> workspace. While not having the locks present at MERGE time as well
> seems a bit wonky from Subversion's perspective (and probably breaks
> ra_svn's assumptions), we know that they were acceptable when we
> updated the workspace copy of the files.
>
Well, we definitely need to send lock-tokens when doing a CHECKOUT and
PUT of each file in the activity. When we MERGE the activity, all of
the checked-out files are implicitly checked-in. Do those checkins
require tokens?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 20 00:10:09 2005