From owner-freebsd-current@FreeBSD.ORG Thu Oct 4 18:42:22 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2169E1065674 for ; Thu, 4 Oct 2012 18:42:22 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id DE36C8FC0A for ; Thu, 4 Oct 2012 18:42:21 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id rp8so1022903pbb.13 for ; Thu, 04 Oct 2012 11:42:21 -0700 (PDT) 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=RRlMY8gRJPOQ57MIMSnFH+3r94s/VaNh9wZK+TbyJck=; b=cEzs5w6CAPXN2c3vgBgk7j+ZXslrsjnceSAOFrNDadx4ckgHQ1SiwZWaRnQ54OGdB4 x+V/Qb5x/z7aILWvwPXx5auOwftlHNqsAAOG8EbOn0NlfJ8nPJPsu0jM+LZoTPmncuib sGvjrrYCnl126FG7SMexbVL0KyDd43sNZLddQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:x-gm-message-state; bh=RRlMY8gRJPOQ57MIMSnFH+3r94s/VaNh9wZK+TbyJck=; b=VETHCdzxZ/abyCCLYM7K3zTIYMn7KwNDLxxVPsF6V36otrgeD6M8yRqmT2GywqAwHR Y8pw+VpAPkRSA2gDS6bDmCfoFiSnujzopSJdZYKlhZIWL9X0Idc526KeRDKW30LUKOrW o29i3xOy85HrNAZm+W8hQwYj5pG+x589Rs8IFjc3m6MAEJZYy2FzlCQY45y0SyqKxYAO yYkdqCLfJlh56tfvXFn7CZ5AaPrpMNqaK9PD0oXFO43/3utp//Fkgtr6A0ErKqqPl429 TGBJHw2bbgpa0TdJOP5jlrKylvxh3fUH2TE+8LArTDaDlRkrIvEwCMLzkszzhY6eI0f8 DlMQ== Received: by 10.68.242.231 with SMTP id wt7mr24051120pbc.99.1349376141336; Thu, 04 Oct 2012 11:42:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.66.190.164 with HTTP; Thu, 4 Oct 2012 11:41:51 -0700 (PDT) In-Reply-To: <1605359247.1742784.1349375747279.JavaMail.root@erie.cs.uoguelph.ca> References: <1349374619.5234.0.camel@powernoodle.corp.yahoo.com> <1605359247.1742784.1349375747279.JavaMail.root@erie.cs.uoguelph.ca> From: Eitan Adler Date: Thu, 4 Oct 2012 14:41:51 -0400 Message-ID: To: Rick Macklem Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQmovlTPD8zEbkg+Q97eIbRND/bcq4i175DiztCJCGuCIkWr/IEP2F2TzTei6sgg3K80esh6 Cc: FreeBSD-Current Subject: Re: svn MFC to stable/8 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 04 Oct 2012 18:42:22 -0000 On 4 October 2012 14:35, Rick Macklem wrote: > Sean Bruno wrote: >> On Thu, 2012-10-04 at 11:10 -0700, Rick Macklem wrote: >> > Hi, >> > >> > Hopefully someone familiar with svn can help. When I try to MFC >> > a kernel change to stable/8, it works, but I end up with tons of >> > mergeinfo. (It looks like every directory under sys.) >> > >> > Does this matter or is there a trick to avoid this? >> > >> > Thanks in advance for any help, rick >> > ps: I seem to MFC fine to stable/9. I only see this for stable/8. >> > _______________________________________________ >> >> Can you post your attempted svn merge command? >> >> Sean > Same as I've always used. When at the top of an updated stable/8 > checkout tree... > # svn merge -c240720 svn+ssh://rmacklem@svn.freebsd.org/base/head/sys sys > > Also, after I reverse merge via: > # svn merge -c-240720 svn+ssh://rmacklem@svn.freebsd.org/base/head/sys sys > # svn status . > M sys > M sys/dev/sound > - so I end up doing an "rm -r" of the tree, followed by a fresh checkout. > (Before, the status wouldn't see anything modified after I would reverse > the merge out.) FYI you could just do svn revert -R, no need for rm -r svn merge -c240720 svn+ssh://svn.freebsd.org/base/head/sys stable8/sys worked for me. Note that lack of a '-' after the 'c' from 'svn help merge': If ARG is negative this is like -r ARG:ARG-1 -- Eitan Adler