From: Matthias Andree Date: Fri, 28 Aug 2009 16:28:57 GMT Subject: Re: Merging in Subversion 1.5 Message-ID: In-Reply-To: <200908281819.10135.jnareb@gmail.com> [culling most of Cc: list] Am 28.08.2009, 18:19 Uhr, schrieb Jakub Narebski : > On Fri, 28 Aug 2009, Avery Pennarun wrote: >> On Fri, Aug 28, 2009 at 3:12 PM, Jakub Narebski wrote: > >> > From what I understand (from what I have read, and browsed, and >> > lurged, and noticed) is that Subversion 1.5+ does merge tracking, but >> > in very different way that in Git: >> > >> >  * the svn:mergeinfo is client-side property; if I understand >> >   correctly this would help you in repeated merges, but not anyone >> >   other >> >> I don't believe there is such a thing as a "client-side property" in >> svn. > > What about svn:ignore or svn:mimetype (IIRC) property? All this is committed to the repository, so there isn't a question of if it's client-side in a sense of "local to the client/checkout". Some properties (such as svn:mergeinfo) require a bit of additional server-side support, but that's about it. Oh, and to complicate matters, let me mention revprops (such as svn:log). SCNR :^) -- Matthias Andree