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

Re: Autoversioning

From: Karl Jackson <karl.jackson_at_starfarmproductions.com>
Date: 2006-06-16 00:09:17 CEST

That makes a lot of sense, thanks Johnathan ! What about normal text files,
created using TextEdit on mac os x, is that merge-able using autoversioning?

If 2 people decided open the same text file (or lets say php files, edited
in Dreamweaver for example), would it merge the changes when each of them
saved it to the mounted drive ?

On 6/15/06 4:53 PM, "Johnathan Gifford" <jgifford@wernervas.com> wrote:

> All users connecting via WebDAV must authenticate for any MS Office
> application to work, especially on Windows platforms, otherwise you will be
> read only version of the file. Anonymous connections via Windows will not
> work due to the locking of the file.
>
> As far as merging is concerned, since all MS Office application files are
> binary, there is no merging available. It will simply overwrite the
> previous version.
>
> Johnathan
>
>
> On 6/15/06 4:41 PM, "Karl Jackson" <karl.jackson@starfarmproductions.com>
> wrote:
>
>> Hi all,
>> I am a new subversion user evaluating subversion for our office, and am
>> intrigued by the autoversioning procedure, as it seems I can skip the whole
>> versioning training.
>> I have taken a bit to get it up and running but its stable now and I am
>> running svn1.3.1/apache2.2.2/os x 10.4.
>>
>> I am trying to understand the autoversioning process: does it adhere to the
>> copy-modify-merge model of subversion or does it use the Lock-Modify-Unlock
>> model?
>>
>> I ask because I tried to test my auto versioned webdav share using a ms word
>> file and found that, when it was being edited , other users could only open
>> read-only copies of the file.
>>
>>
>> I have read the svn book section on autoversioning, and all it says is that
>> the system automatically versions the files, but how does it handle merging
>> files , or conflicts with merging ?
>>
>> Thanks in advance for your time,
>> Karl
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 16 00:10:14 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.