From owner-freebsd-current@FreeBSD.ORG Wed Dec 11 00:25:20 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 09FE3DF6 for ; Wed, 11 Dec 2013 00:25:20 +0000 (UTC) Received: from mail-qc0-x231.google.com (mail-qc0-x231.google.com [IPv6:2607:f8b0:400d:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B67C51EE8 for ; Wed, 11 Dec 2013 00:25:19 +0000 (UTC) Received: by mail-qc0-f177.google.com with SMTP id m20so4501759qcx.22 for ; Tue, 10 Dec 2013 16:25:19 -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=8wWcv2qE475TK7UacxUluFcvqd6n2dWPbN77DNHCr+g=; b=FE22Q2JU2BY/62haug+VgoWv8xtuLGNLVV1ZrOjux+9q4MpI2oBtWUxVzAABb/mTOf KX3wCr5xTE9u3MUGCjP/Reeuqfaydg3rTL5X0sI7VYjUFzAUP+23hh5Hm2+OS/CC79sH euO6K/LZ6gPvZQ/RqJ/y26AGAaxLZbpxsVQ2s= 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=8wWcv2qE475TK7UacxUluFcvqd6n2dWPbN77DNHCr+g=; b=jOReW+Kjw7sj9LwAnhZ8K31LLJGU3UvNUFASPL55HCac902dK/mbmISUcyzhTUOTTS iAvzJlwPs9uE34uwHa2HEz8iIKn/gsx+niroptUlfmuj3zX/V1ePaDjrFx5dqQmzoC4X LBkZ1eIegKZdfW2BYyWLox6my/Eb9Of5NqNZaum5tbEy6ksnJTEZUkDCGrK9M6Qx2b4r K1Yjwb6NNutB4AnEhOTbsQanccybLY4o2oB+LnNx9qzmb9JQj18IHOn4csGMawLcFOx1 uw4d0BKNM1RjwD0IHkXWF6J0vBdHB9PKxkCPBjCdFGoL7l5ABPHoG1TqHbU40vHx/JU3 hf7g== X-Gm-Message-State: ALoCoQnzkYeOzpSNFkEioGhtR1a2q1VfN1mKIUxXpj0wk1hg/QGT4BQuL0lB0pgN43VrkHXP9Emb X-Received: by 10.49.74.138 with SMTP id t10mr49297152qev.21.1386721518907; Tue, 10 Dec 2013 16:25:18 -0800 (PST) MIME-Version: 1.0 Received: by 10.96.86.42 with HTTP; Tue, 10 Dec 2013 16:24:48 -0800 (PST) In-Reply-To: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca> References: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca> From: Eitan Adler Date: Tue, 10 Dec 2013 19:24:48 -0500 Message-ID: Subject: Re: svn merge to stable/10 has lotsa mergeinfo To: Rick Macklem Content-Type: text/plain; charset=UTF-8 Cc: 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 00:25:20 -0000 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. -- Eitan Adler