Date: Fri, 12 Dec 2008 08:21:25 -0800 From: Tim Kientzle <kientzle@freebsd.org> To: rick-freebsd2008@kiwi-computer.com Cc: freebsd-hackers@freebsd.org, Artis Caune <artis.caune@gmail.com> Subject: Re: Strange "changed paths" in svn commits Message-ID: <49428F85.7030701@freebsd.org> In-Reply-To: <20081212155833.GB82667@keira.kiwi-computer.com> References: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com> <20081212155833.GB82667@keira.kiwi-computer.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Rick C. Petty wrote: > On Fri, Dec 12, 2008 at 01:15:17PM +0200, Artis Caune wrote: > > I suspect you've run into a well-known svn bug that affects "svn merge". I > thought they had fixed it with subversion 1.5.4, but apparently it's still > around. When doing a merge, it seems to randomly touch a bunch of files.. > it only updates the svn:mergeinfo property on those files ... I've seen this happen only once and eventually figured out that I had a partial checkout underneath the merge point. It was especially confusing in my case because I actually had a complete checkout---nothing was missing---but one of the directories was marked "depth=immediates" so it was treated as a partial checkout. If the svn:mergeinfo has asterisks in it, this is why. Tim
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49428F85.7030701>