From owner-freebsd-current@FreeBSD.ORG Wed Dec 11 13:58:23 2013 Return-Path: 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 748C386B for ; Wed, 11 Dec 2013 13:58:23 +0000 (UTC) Received: from mail-qe0-x22c.google.com (mail-qe0-x22c.google.com [IPv6:2607:f8b0:400d:c02::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D5131DA2 for ; Wed, 11 Dec 2013 13:58:22 +0000 (UTC) Received: by mail-qe0-f44.google.com with SMTP id nd7so5354945qeb.3 for ; Wed, 11 Dec 2013 05:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=chC/tdGajvEmpeIBE88v3udLapaKmJAR56nGia5hvnI=; b=MplogVLHBxMXg6Z3pkIPd5849n/8IjcD9gY7Us+0PNjwIvaFdJ+0iMeHsW0AcIwRpU I6DXGMQs6aQkt/YP2OL0SRS+oPCbMtS1HNO/3iUvdFUrGPWtQ/yEKaml9tVZ4HOMsgi0 7g4VyU/hie50R1mxSm8z0HkTCcNTA6lFQD7to= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=chC/tdGajvEmpeIBE88v3udLapaKmJAR56nGia5hvnI=; b=CoGZGiLCoP9SPRVBxGbHe0vtiO9dnfQFmLVZuuFHNx4T6oWe3ZXmuuTimX6tIRn22n ZKm/aF+sBIA14pFlqviWrRrdHmfcEDwU6i/jQP0RCOFvHGOb8/B3Wn/yevTYRZmq7Cru wgdAdIfWUzObfRsDvkpVXfrRwRYd2SvEAUhs4iS3kicHOMQhGuNvjKAIz2tjTOQmSJm2 WNiCQRT7Fg/qLz8opYH9f0VF0z9vT6DsY2U/EGBqqaL6zKWzlTFJAgRkBUh43P6dbg9I 6WlErs+/R5XOjTEgZz6B5mi/57bfI9Pvok7eh/lNQs6J50Wh+wU11ezulWzQYLXB/lYO 8Scw== X-Gm-Message-State: ALoCoQk/Qr7kpx5+3DnuVtfXr5Ofd8JmjxuaQBmP+qPIG9n+bF4TQx5Y9QIlaC4nBwqKmDsVwok4 X-Received: by 10.49.74.138 with SMTP id t10mr2798156qev.21.1386770302217; Wed, 11 Dec 2013 05:58:22 -0800 (PST) MIME-Version: 1.0 Received: by 10.96.86.42 with HTTP; Wed, 11 Dec 2013 05:57:52 -0800 (PST) In-Reply-To: <52A86E52.3030502@freebsd.org> References: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca> <52A86E52.3030502@freebsd.org> From: Eitan Adler Date: Wed, 11 Dec 2013 08:57:52 -0500 Message-ID: Subject: Re: svn merge to stable/10 has lotsa mergeinfo To: Julian Elischer Content-Type: text/plain; charset=UTF-8 Cc: Rick Macklem , freebsd-current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Dec 2013 13:58:23 -0000 On Wed, Dec 11, 2013 at 8:53 AM, Julian Elischer wrote: > On 12/11/13, 8:24 AM, Eitan Adler wrote: >> >> On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem >> 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? Details here: http://www.freebsd.org/doc/en/articles/committers-guide/article.html#merge If this not clear please let me know. -- Eitan Adler