preventing recording misaligned mergeinfos

2015-08-28 Thread Stefan Hett
Hi, I'm currently checking-out ways to prevent the creation of misaligned mergeinfos in SVN. My current solution would be to add a pre-commit hook to prevent any mergeinfo records on any but the top-most node (aka: trunk or a branch). While this would prevent most cases which let to

RE: preventing recording misaligned mergeinfos

2015-08-28 Thread Andrew Reedick
I was under the impression that subversion now automatically takes subtree mergeinfo into account: http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.stayinsync.subtree -Original Message- From: Stefan Hett [mailto:ste...@egosoft.com]

Re: preventing recording misaligned mergeinfos

2015-08-28 Thread Stefan Hett
It does and that's not quite the problem for me. However what's possible to do with SVN are merges like these: merge A/B/somefile into A absolutely valid operation, but nothing we use here. In cases this is done here in our company it's always an incorrect merge (because someone chose the