Date: Thu, 16 Feb 2012 11:25:31 +0200 From: Jaakko Heinonen <jh@FreeBSD.org> To: Eitan Adler <eadler@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: <20120216092531.GA64733@jh> In-Reply-To: <CAF6rxgmSSZ9h-eTYDAdg_AT-WepUScpXEYNCnaBhbU1xPnkf5Q@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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? %%% Property changes on: share ___________________________________________________________________ Deleted: svn:mergeinfo Reverse-merged /head/share:r226702,227006,228761,229067,229831,229997,230127,230587,231111,231331 Reverse-merged /vendor/resolver/dist/share:r1540-186085 Reverse-merged /projects/largeSMP/share:r221273-222812,222815-223757 Reverse-merged /projects/quota64/share:r184125-207707 %%% -- Jaakko
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120216092531.GA64733>