Date: Fri, 12 Dec 2008 09:58:33 -0600 From: "Rick C. Petty" <rick-freebsd2008@kiwi-computer.com> To: Artis Caune <artis.caune@gmail.com> Cc: freebsd-hackers@freebsd.org Subject: Re: Strange "changed paths" in svn commits Message-ID: <20081212155833.GB82667@keira.kiwi-computer.com> In-Reply-To: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com> References: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Dec 12, 2008 at 01:15:17PM +0200, Artis Caune wrote: > Hi, > > Is it how merging works or I'm missing something? 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, but it's still annoying. Whenever I do a merge, I always merge into a working copy, then double-check the work with "svn diff" before committing. When I see it bring in extra files, I just do a revert on those, then the commit is clean. I'm hoping the tigris folks are working on this issue. -- Rick C. Petty
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081212155833.GB82667>