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

very frequent svn conflict issue

From: J. Bakshi <joydeep_at_infoservices.in>
Date: Fri, 20 Nov 2009 11:05:23 +0530

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.

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.

Could any one kindly suggest why so frequent conflict ? is the *force*
option actual culprit ? I have no idea !!! some enlightenment please

-- 
জয়দীপ বক্সী
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2420397
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-20 06:36:36 CET

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.