Re: preventing recording misaligned mergeinfos

2015-09-06 Thread Daniel Shahaf
Stefan Hett wrote on Fri, Aug 28, 2015 at 19:03:08 +0200: > 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 That surprises me. We have a similar validation for 'switch' that enforces the source and tar

Re: preventing recording misaligned mergeinfos

2015-09-05 Thread Joseba Ercilla Olabarri
Hi, On Fri, Aug 28, 2015 at 7:03 PM, Stefan Hett wrote: > 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 co

Re: preventing recording misaligned mergeinfos

2015-08-28 Thread Stefan Hett
.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.stayinsync.subtree -Original Message- From: Stefan Hett [mailto:ste...@egosoft.com] Sent: Friday, August 28, 2015 9:19 AM To: 'subversion' Subject: preventing recording misaligned mergeinfos Hi, I'm currently ch

RE: preventing recording misaligned mergeinfos

2015-08-28 Thread Andrew Reedick
] Sent: Friday, August 28, 2015 9:19 AM To: 'subversion' Subject: preventing recording misaligned mergeinfos 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

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 misaligne