From: Matthias Andree Date: Fri, 28 Aug 2009 15:44:04 GMT Subject: Re: Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions) Message-ID: In-Reply-To: <32541b130908280829s6fcebbe5ja84b10e649de1eb3@mail.gmail.com> Am 28.08.2009, 17:29 Uhr, schrieb Avery Pennarun : > I think they probably meant that it's the client's responsibility to > set the property correctly, not the server's, and if your client is > too old any you do a merge, it'll forget to set svn:mergeinfo, causing > confusion for everyone. There's discussion in the svn book > (http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html) but > nothing implies that it's a non-replicated property. Indeed, I can > see no particular reason that anyone would want it to be, for the > reasons you specify. It is replicated, and the common remedy against older clients is to refuse commits from those clients that do not support mergeinfo. This is done by defining a repository hook on the server side that validates this. AFAIR such a hook example ships with SVN. -- Matthias Andree