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

Re: very frequent svn conflict issue

From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Fri, 20 Nov 2009 15:46:06 +1000

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.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-20 06:47:25 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.