Re: Access control to stop creation of files/directories but allow svn:mergeinfo to be updated

2016-03-19 Thread Daniel Shahaf
webster.br...@rogers.com wrote on Wed, Mar 16, 2016 at 14:18:10 +: > It is looking like this custom pre-commit hook script will need to > differentiate svn:mergeinfo property changes from the general > changes.  Then query for general access control hopefully with an > existing python/ini solut

Re: What branching patterns work with Subversion reintegrate merge?

2016-03-19 Thread Stefan Sperling
On Fri, Mar 18, 2016 at 08:22:06PM +, Bob Berger wrote: > Subversion requires you to do a sync merge from your trunk to a branch, > before you can do a reintegrate merge from the branch back to the trunk. But > the sync merge seems incompatible with a branching pattern where the trunk > contain

Re: try to revert from a bad merge but get error result

2016-03-19 Thread Ryan Schmidt
On Mar 15, 2016, at 9:22 AM, James wrote: > Something wrong after I commit my merge from a branch to trunk. Now the > version number is 689 and the previous is 687 in the trunk tree. > I followed the online suggestions did the following from my trunk working > copy directory: > svn up > svn mer