From: John Baldwin <jhb@freebsd.org>
To: Alfred Perlstein <alfred@freebsd.org>
Subject: Fwd: Re: SVN merge question.
Date: Fri, 1 Feb 2013 09:49:23 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; )
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_zX9CRbNRbX0geE6"
Message-Id: <201302010949.23897.jhb@freebsd.org>

--Boundary-00=_zX9CRbNRbX0geE6
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit


-- 
John Baldwin

--Boundary-00=_zX9CRbNRbX0geE6
Content-Type: message/rfc822;
  name="forwarded message"
Content-Transfer-Encoding: 7bit
Content-Description: John Baldwin <jhb@freebsd.org>: Re: SVN merge question.
Content-Disposition: inline

Return-Path: <owner-all-developers@FreeBSD.org>
Received: from bigwig.baldwin.cx ([unix socket])
	 by bigwig.baldwin.cx (Cyrus v2.3.16) with LMTPA;
	 Fri, 01 Jun 2012 14:03:50 -0400
X-Sieve: CMU Sieve 2.3
Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35])
	by bigwig.baldwin.cx (Postfix) with ESMTP id D243EB94A
	for <john@baldwin.cx>; Fri,  1 Jun 2012 14:03:49 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36])
	by mx2.freebsd.org (Postfix) with ESMTP id E7584B6791
	for <john@baldwin.cx>; Fri,  1 Jun 2012 17:56:18 +0000 (UTC)
Received: by hub.freebsd.org (Postfix)
	id 327CC1065698; Fri,  1 Jun 2012 17:56:16 +0000 (UTC)
Delivered-To: jhb@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 538)
	id 63D71106566B; Fri,  1 Jun 2012 17:56:11 +0000 (UTC)
Delivered-To: developers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1A1741065675;
	Fri,  1 Jun 2012 17:56:06 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id E42B28FC18;
	Fri,  1 Jun 2012 17:56:05 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id 3F2FAB960;
	Fri,  1 Jun 2012 13:56:05 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: obrien@freebsd.org
Subject: Re: SVN merge question.
Date: Fri, 1 Jun 2012 13:56:03 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p13; KDE/4.5.5; amd64; ; )
Cc: Grzegorz Bernacki <gber@freebsd.org>,
 Eitan Adler <eadler@freebsd.org>,
 developers@freebsd.org
References: <4FB3B779.8070006@freebsd.org> <201205161100.48208.jhb@freebsd.org> <20120601174029.GD9318@dragon.NUXI.org>
In-Reply-To: <20120601174029.GD9318@dragon.NUXI.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201206011356.03933.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 01 Jun 2012 13:56:05 -0400 (EDT)
Sender: owner-all-developers@FreeBSD.org
Precedence: bulk
X-Loop: FreeBSD.ORG
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 01 Jun 2012 14:03:49 -0400 (EDT)
X-Virus-Scanned: clamav-milter 0.97.3 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00,T_RP_MATCHES_RCVD
	autolearn=ham version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on bigwig.baldwin.cx
X-Length: 4232
X-UID: 41129

On Friday, June 01, 2012 1:40:29 pm David O'Brien wrote:
> On Wed, May 16, 2012 at 11:00:48AM -0400, John Baldwin wrote:
> > I more or less don't trust svn merge to DTRT here.  This was done with
> > the cpuset branch merge up to HEAD and it broke the log history of many
> > files in HEAD.
> 
> Specifically how did it break log history?

http://svnweb.freebsd.org/base/head/share/man/man4/geom_map.4?view=log

You have to walk up to the previous directory in svnweb and go back to
change 222812 and then click on geom_map.4 to find its original log.

sys/dev/iicbus/ad7417.c was also busted this way.

> > I would just generate a diff and manually apply that to
> > a HEAD checkout and commit that.  You could perhaps svn cp over new files
> > from the nand branch to HEAD to preserve their history, but I worry that
> > anything other than diff + patch for existing files risks hosing history.
> 
> WOAH!!  Please lets gain some new experience with 'svn merge' using
> version 1.7.  We do 100's of merges a year at $WORK (with svn 1.6)
> on a code base 10x that of FreeBSD -- it works.

I've never had problems with merging downstream into work branches.  I've
only seen upstream merges blow up.

-- 
John Baldwin
-- 
This mail is for the internal use of the FreeBSD project committers,
and as such is private. This mail may not be published or forwarded
outside the FreeBSD committers' group or disclosed to other unauthorised
parties without the explicit permission of the author(s).


--Boundary-00=_zX9CRbNRbX0geE6--