Date: Thu, 16 Feb 2012 19:03:49 -0800 From: Doug Barton <dougb@FreeBSD.org> To: Jaakko Heinonen <jh@FreeBSD.org> Cc: src-committers@freebsd.org, Eitan Adler <eadler@freebsd.org>, svn-src-stable@freebsd.org, svn-src-all@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: <4F3DC395.1050009@FreeBSD.org> In-Reply-To: <20120216092531.GA64733@jh> 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> <CAF6rxgmSSZ9h-eTYDAdg_AT-WepUScpXEYNCnaBhbU1xPnkf5Q@mail.gmail.com> <20120216092531.GA64733@jh>
next in thread | previous in thread | raw e-mail | index | archive | help
On 02/16/2012 01:25, Jaakko Heinonen wrote: > On 2012-02-15, Eitan Adler wrote: >> 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: >>>> >>>> 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. >>> >>> Looking at previous merges I would have merged it to share/examples. >> >> I updated the wiki (see #11) and thanks for the help. > > I think that the mergeinfo from stable/9/share could be just deleted. > Unless I am mistaken there hasn't been merges that would place mergeinfo > only to stable/9/share after r230653. > > Could someone confirm that this is the right thing to do? The mergeinfo should be placed in the correct location first, but then it can be removed from share/, yes. -- It's always a long day; 86400 doesn't fit into a short. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F3DC395.1050009>