On Fri, Dec 12, 2008 at 08:21:25AM -0800, Tim Kientzle wrote:
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.
In my case, I had a fresh copy that I merged a single file into, but it
touched 5 other random files; files I had never seen, much less ever
edited. We've seen this behavior for weeks, but the rate of occurances
dropped significantly with svn 1.5.4-- dropped, not disappeared completely.
-- Rick C. Petty
___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org
