From owner-freebsd-hackers@FreeBSD.ORG  Fri Dec 12 16:21:30 2008
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B78841065672
	for <freebsd-hackers@freebsd.org>; Fri, 12 Dec 2008 16:21:30 +0000 (UTC)
	(envelope-from kientzle@freebsd.org)
Received: from kientzle.com (kientzle.com [66.166.149.50])
	by mx1.freebsd.org (Postfix) with ESMTP id 90B308FC0C
	for <freebsd-hackers@freebsd.org>; Fri, 12 Dec 2008 16:21:30 +0000 (UTC)
	(envelope-from kientzle@freebsd.org)
Received: from [10.123.2.178] (p53.kientzle.com [66.166.149.53])
	by kientzle.com (8.12.9/8.12.9) with ESMTP id mBCGLUtv078637;
	Fri, 12 Dec 2008 08:21:30 -0800 (PST)
	(envelope-from kientzle@freebsd.org)
Message-ID: <49428F85.7030701@freebsd.org>
Date: Fri, 12 Dec 2008 08:21:25 -0800
From: Tim Kientzle <kientzle@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060422
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: rick-freebsd2008@kiwi-computer.com
References: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com>
	<20081212155833.GB82667@keira.kiwi-computer.com>
In-Reply-To: <20081212155833.GB82667@keira.kiwi-computer.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-hackers@freebsd.org, Artis Caune <artis.caune@gmail.com>
Subject: Re: Strange "changed paths" in svn commits
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Dec 2008 16:21:30 -0000

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