From owner-freebsd-hackers@FreeBSD.ORG  Fri Dec 12 15:58:34 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 D48E4106564A
	for <freebsd-hackers@freebsd.org>; Fri, 12 Dec 2008 15:58:34 +0000 (UTC)
	(envelope-from rick@kiwi-computer.com)
Received: from kiwi-computer.com (keira.kiwi-computer.com [63.224.10.3])
	by mx1.freebsd.org (Postfix) with SMTP id 6C4348FC21
	for <freebsd-hackers@freebsd.org>; Fri, 12 Dec 2008 15:58:34 +0000 (UTC)
	(envelope-from rick@kiwi-computer.com)
Received: (qmail 82884 invoked by uid 2001); 12 Dec 2008 15:58:33 -0000
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>
Message-ID: <20081212155833.GB82667@keira.kiwi-computer.com>
References: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com>
User-Agent: Mutt/1.4.2.3i
Cc: freebsd-hackers@freebsd.org
Subject: Re: Strange "changed paths" in svn commits
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: rick-freebsd2008@kiwi-computer.com
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 15:58:34 -0000

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