Re: very frequent svn conflict issue

On Nov 20, 2009, at 00:11, J. Bakshi wrote:

>> On Fri, Nov 20, 2009 at 3:35 PM, J. Bakshi wrote:
>>
>>> ` ` `
>>> 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.
>>

Why would Apache or anything else other "svn up" be creating directories in /var/www/mysite?

>>> But the conflict issue has come in-front. More and more files are in
>>> conflict stage and as a result the post-commit hook fails to update the
>>> website after commit.
>>

Why would any conflict occur if the only process making changes in /var/www/mysite is "svn up"?

By asking these questions, I'm trying to point out that "svn up" should be the only process making changes in that directory. Change the ownership and/or permissions of the directory so that no user other than the user your repository is served as (apache? svnserve?) can make changes there.

> 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.

If you need to add a typo3 extension or plugin (or indeed make any other change to your source code), exactly one developer should be responsible for doing it. You shouldn't have two developers making the same changes; that's a waste of effort and a sure way to get conflicts -- not only within Subversion but also conventionally, between your developers. Adding the extension (or making other source code changes) should be happening in your developers' private working copies; again, nothing other than "svn up" should be touching your /var/www/mysite directory. That directory should mirror what's in your repository, nothing more.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2420429

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-20 08:56:31 CET