Re: very frequent svn conflict issue

Daniel Becroft wrote:
> On Fri, Nov 20, 2009 at 3:35 PM, J. Bakshi <joydeep_at_infoservices.in> wrote:
>
>> Dear list ,
>>
>> As more and more users are using svn in my office ; more and more svn
>> conflict issue is coming up. I have configured the svn with post-commit
>> hook so that it automatically update the files under htdocs so a commit
>> also update the website too. To achieve this I have placed the following
>> in post-conmmit script
>>
>> ` ` `
>> LANG=en_US.UTF-8 /usr/bin/svn up --force /var/www/mysite
>> ` ` `
>>
>> The force option is there to allow users to add file/folders which are
>> created by apache. Before I had to manually add those folders every time
>> apache creates some file/folder by svn add. If the users try to add
>> those by downloading it by ftp; svn denied to add by saying file
>> already exist. Now with the *force* option users can add the
>> files/folders created by apache by just downloading the new file/folders
>> by ftp and then add it through svn.
>>
>
> I think you may need to explain, in a bit more detail, the workflow
> that is being used. What working copy is being committed from? What do
> you mean by "add file/folders which are created by apache" and/or "If
> the users try to add those by downloading it by FTP"?
>
> Regards,
> Daniel B.
>
>

Hello Daniel,

Thanks for your response. I am using typo3 cms. typo3 is like drupal,
zoomla a content management system. I have added the typo3 directory
as a svn repo. It is possible to create extension with in typo3 if it
has the write permission and this newly created file/folders are owned
by apache obviously; hence users can create required extension with in
typo3 and they can download those by ftp and add those in svn repo as I
have configured "/usr/bin/svn up --force".

Multiple php developers sometimes work with the same file . I don't know
if their commit just create the conflict as *force* option is there.

Please ask if you need more info.

-- 
জয়দীপ বক্সী
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2420402
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].