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

Re: preventing recording misaligned mergeinfos

From: Stefan Hett <stefan_at_egosoft.com>
Date: Fri, 28 Aug 2015 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

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 wrong destination folder.
So we want to prevent issues like these, because they can easily result
in polluting the mergeinfo records.

> 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:stefan_at_egosoft.com]
> 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 records on any but the top-most node (aka:
> trunk or a branch). While this would prevent most cases which let to misaligned mergeinfos, it's certainly not exactly what I want/need.
>
> Does anybody have an idea for a better/more precise solution/approach?
>
> --
> Regards,
> Stefan Hett, Developer/Administrator
>
> EGOSOFT GmbH, Heidestrasse 4, 52146 Würselen, Germany
> Tel: +49 2405 4239970, www.egosoft.com
> Geschäftsführer: Bernd Lehahn, Handelsregister Aachen HRB 13473
>
>

-- 
Regards,
Stefan Hett
Received on 2015-08-28 19:03:31 CEST

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.