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

Jaakko Heinonen jh at FreeBSD.org
Thu Feb 16 09:25:40 UTC 2012


On 2012-02-15, Eitan Adler wrote:
> On Wed, Feb 15, 2012 at 11:09 AM, Jaakko Heinonen <jh at freebsd.org> wrote:
> > On 2012-02-15, Eitan Adler wrote:
> >> On Wed, Feb 15, 2012 at 10:50 AM, Jaakko Heinonen <jh at 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


More information about the svn-src-all mailing list