From owner-svn-src-stable-9@FreeBSD.ORG Wed Feb 15 15:55:17 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71A2B1065675; Wed, 15 Feb 2012 15:55:04 +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 200928FC08; Wed, 15 Feb 2012 15:55:02 +0000 (UTC) Received: by werm13 with SMTP id m13so1135893wer.13 for ; Wed, 15 Feb 2012 07:55:02 -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; bh=9TONhAra0mqQvkbau+fIlXNYdsGLXtxK8hPJh7PCrQw=; b=OOWbT2gwrk4jB+Q8+ffaxhA1gtdFgCdcr2A53ElLL0YPGfWNI4ZHXEp31NUBp8FlwU 4a1geNggXX7lfBvUibL9SoA6SXCv/hqmCFtsJtbG92w8j16qPmuHXfIN/8M8mc/WSQSA KhZjvYb1IW3DXzPYVwcsqOuIFA7t0jkMZ7jZI= Received: by 10.180.77.228 with SMTP id v4mr36491307wiw.2.1329321302260; Wed, 15 Feb 2012 07:55:02 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.223.15.90 with HTTP; Wed, 15 Feb 2012 07:54:32 -0800 (PST) In-Reply-To: <20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi> References: <201201281948.q0SJmjIL096609@svn.freebsd.org> <20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi> From: Eitan Adler Date: Wed, 15 Feb 2012 10:54:32 -0500 X-Google-Sender-Auth: 492tYvffb5gcPnfDI8AkI0sEnHg Message-ID: To: Jaakko Heinonen Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQlZw+gevo9CC4tGITV4WxznA+RDhnxPw6iiOPnBpObME/SyKbD5vgHVTds06UPA6dRlpawh 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-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 15:55:17 -0000 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: 2811 svn 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. -- Eitan Adler Source & Ports committer X11, Bugbusting teams