From owner-freebsd-current@FreeBSD.ORG  Wed Dec 11 00:31:14 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 542C5F9
 for <freebsd-current@freebsd.org>; Wed, 11 Dec 2013 00:31:14 +0000 (UTC)
Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca
 [131.104.91.44]) by mx1.freebsd.org (Postfix) with ESMTP id 0D5661F76
 for <freebsd-current@freebsd.org>; Wed, 11 Dec 2013 00:31:13 +0000 (UTC)
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: 
X-IronPort-AV: E=Sophos;i="4.93,867,1378872000"; d="scan'208";a="78480450"
Received: from muskoka.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca)
 ([131.104.91.222])
 by esa-jnhn.mail.uoguelph.ca with ESMTP; 10 Dec 2013 19:31:13 -0500
Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1])
 by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id 1B312B4046;
 Tue, 10 Dec 2013 19:31:13 -0500 (EST)
Date: Tue, 10 Dec 2013 19:31:13 -0500 (EST)
From: Rick Macklem <rmacklem@uoguelph.ca>
To: Eitan Adler <lists@eitanadler.com>
Message-ID: <1557824587.28927090.1386721873101.JavaMail.root@uoguelph.ca>
In-Reply-To: <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com>
Subject: Re: svn merge to stable/10 has lotsa mergeinfo
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-Originating-IP: [172.17.91.202]
X-Mailer: Zimbra 7.2.1_GA_2790 (ZimbraWebClient - FF3.0 (Win)/7.2.1_GA_2790)
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 00:31:14 -0000

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.
> 
Ok, thanks, rick

> 
> 
> --
> Eitan Adler
>