From owner-svn-src-stable@FreeBSD.ORG Wed Feb 15 16:32:40 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20B89106564A; Wed, 15 Feb 2012 16:32:40 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 94C058FC15; Wed, 15 Feb 2012 16:32:38 +0000 (UTC) Received: by werm13 with SMTP id m13so1177215wer.13 for ; Wed, 15 Feb 2012 08:32:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=avrnaM9LYLEvgjzLE5AjukdFFckD3vxsXAI29eSgjeo=; b=Yc80+nYq1Les+E3CtMWU374iaw7q1k6Sq7HhBywEAtkdi/4muluh1lnfM1O1zkDbcP pB2kfAsG1IV3t66HMAC4k6y0AKvz+p1wRKOeuhORWNefpVPCbLfXY6ExDbaelKtWAU92 /LLOIxS7DO7GRFGpJ5v++62fIMlcxjG/3N0Z0= Received: by 10.180.92.73 with SMTP id ck9mr36703957wib.2.1329323557854; Wed, 15 Feb 2012 08:32:37 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.223.15.90 with HTTP; Wed, 15 Feb 2012 08:32:07 -0800 (PST) In-Reply-To: <20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi> References: <201201281948.q0SJmjIL096609@svn.freebsd.org> <20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi> <20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi> From: Eitan Adler Date: Wed, 15 Feb 2012 11:32:07 -0500 X-Google-Sender-Auth: unTh5Ays0fQE8b_M_Xx4fqxmQ98 Message-ID: To: Jaakko Heinonen Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQkWnQDEAvVEJIRHy4TB9QjfLqGyINmJGGjBJG2CH1wk8TMBrcD2R3C9UEOx2+WgwLz+sNiq Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org, cperciva@freebsd.org Subject: Re: svn commit: r230653 - in stable/9: lib/libopie share/examples/diskless share/examples/ppp share/examples/printing tools/tools/nanobsd/pcengines/Files/root usr.sbin/pkg_install/add X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 16:32:40 -0000 On Wed, Feb 15, 2012 at 11:09 AM, Jaakko Heinonen wrote: > On 2012-02-15, Eitan Adler wrote: >> On Wed, Feb 15, 2012 at 10:50 AM, Jaakko Heinonen wrote= : >> >> > I think this commit incorrectly placed mergeinfo to stable/9/share/. >> >> I used the following command: >> >> =C2=A02811 =C2=A0svn merge -c229831 $FSVN/head/share share >> >> Should I have committed somewhere else? >> http://wiki.freebsd.org/SubversionPrimer/Merging is not particularly >> helpful for share/ changes. > > Looking at previous merges I would have merged it to share/examples. I updated the wiki (see #11) and thanks for the help. --=20 Eitan Adler Source & Ports committer X11, Bugbusting teams