> 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
So you are getting the conflict on the working copy on the server when you do the update? If so, this tells me that those files are being changed on the server. That is the only way you would get a conflict when you do an update. Perhaps you need to do a svn revert before you do your up?
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2420956
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-20 16:41:09 CET