Date: Wed, 15 Feb 2012 11:32:07 -0500 From: Eitan Adler <eadler@freebsd.org> To: Jaakko Heinonen <jh@freebsd.org> 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 Message-ID: <CAF6rxgmSSZ9h-eTYDAdg_AT-WepUScpXEYNCnaBhbU1xPnkf5Q@mail.gmail.com> 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> <CAF6rxgn8R8xLDGr%2BwzcnYOs=PUqWtB9YZgqqyK0b45VtKFSkqA@mail.gmail.com> <20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Feb 15, 2012 at 11:09 AM, Jaakko Heinonen <jh@freebsd.org> wrote: > On 2012-02-15, Eitan Adler wrote: >> On Wed, Feb 15, 2012 at 10:50 AM, Jaakko Heinonen <jh@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgmSSZ9h-eTYDAdg_AT-WepUScpXEYNCnaBhbU1xPnkf5Q>