external merge tools for conflicts only

2013-01-12 Thread Warren Block
Is there any way to get svn to use an external merge tool, but only for conflicts? In other words, if I set up an external merge tool like diffuse (http://diffuse.sourceforge.net/), when svn finds a conflict it just throws both repository and working copy files at the external merge tool. In

Re: access control for Subfolder is not work in svn 1.6

2013-01-12 Thread Nico Kadel-Garcia
On Sat, Jan 12, 2013 at 9:12 AM, Raghu GS wrote: > Thorsten Schöning am-soft.de> writes: > >> >> Guten Tag Raghu GS, >> am Samstag, 12. Januar 2013 um 11:51 schrieben Sie: >> >> > svn:external can only function in a working copy. >> > How do implement the same in svn source. >> > Because people m

Re: access control for Subfolder is not work in svn 1.6

2013-01-12 Thread Raghu GS
Thorsten Schöning am-soft.de> writes: > > Guten Tag Raghu GS, > am Samstag, 12. Januar 2013 um 11:51 schrieben Sie: > > > svn:external can only function in a working copy. > > How do implement the same in svn source. > > Because people may not check working copy. > > svn:external is something

Re: access control for Subfolder is not work in svn 1.6

2013-01-12 Thread Thorsten Schöning
Guten Tag Raghu GS, am Samstag, 12. Januar 2013 um 11:51 schrieben Sie: > svn:external can only function in a working copy. > How do implement the same in svn source. > Because people may not check working copy. svn:external is something which needs to be recognized by the client, it doesn't nece

Re: access control for Subfolder is not work in svn 1.6

2013-01-12 Thread Raghu GS
Grierson, David bskyb.com> writes: > > Hi, > > If I remember correctly, you cannot remove permissions which you have already granted for a parent folder. > > See this answer on ServerFault for a more complete explanation of how I would go about achieving this. > > http://serverfault.com/que