From owner-freebsd-current@FreeBSD.ORG  Wed Dec 11 13:53:43 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6426F6CC
 for <freebsd-current@freebsd.org>; Wed, 11 Dec 2013 13:53:43 +0000 (UTC)
Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3444D1D5F
 for <freebsd-current@freebsd.org>; Wed, 11 Dec 2013 13:53:42 +0000 (UTC)
Received: from Julian-MBP3.local (ppp121-45-246-96.lns20.per2.internode.on.net
 [121.45.246.96]) (authenticated bits=0)
 by vps1.elischer.org (8.14.7/8.14.7) with ESMTP id rBBDrRTT038067
 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO);
 Wed, 11 Dec 2013 05:53:32 -0800 (PST)
 (envelope-from julian@freebsd.org)
Message-ID: <52A86E52.3030502@freebsd.org>
Date: Wed, 11 Dec 2013 21:53:22 +0800
From: Julian Elischer <julian@freebsd.org>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9;
 rv:24.0) Gecko/20100101 Thunderbird/24.1.1
MIME-Version: 1.0
To: Eitan Adler <lists@eitanadler.com>, Rick Macklem <rmacklem@uoguelph.ca>
Subject: Re: svn merge to stable/10 has lotsa mergeinfo
References: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca>
 <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com>
In-Reply-To: <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-current <freebsd-current@freebsd.org>
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Dec 2013 13:53:43 -0000

On 12/11/13, 8:24 AM, Eitan Adler wrote:
> On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem <rmacklem@uoguelph.ca> wrote:
>> Hi,
>>
>> I just tried to MFC into stable/10 and it worked, but with
>> a lot of mergeinfo. I know diddly about svn, so is this ok?
> Starting with stable/10 and later you must merge into the *root*, not into sys/.
>
> P.S., with svn, it can be very helpful to provide the exact commands you used.
>
>
>
so how about you tell people what you call root?  base? releng? 8? sys?  the place you did the checkout to?
Experts always assume that everyone has the decoder rings.