Date: Fri, 17 Feb 2012 08:33:21 +0200 From: Jaakko Heinonen <jh@FreeBSD.org> To: Doug Barton <dougb@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: <20120217063321.GA2273@a91-153-116-96.elisa-laajakaista.fi> In-Reply-To: <4F3DCCC9.4080908@FreeBSD.org> 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> <4F3DC395.1050009@FreeBSD.org> <CAF6rxgn3mtTVD9NEg%2BzLscSRQ14rhFLDe0HnaMGSRjXg4EcOFg@mail.gmail.com> <4F3DCCC9.4080908@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2012-02-16, Doug Barton wrote: > On 02/16/2012 19:07, Eitan Adler wrote: > > On Thu, Feb 16, 2012 at 10:03 PM, Doug Barton <dougb@freebsd.org> wrote: > >> The mergeinfo should be placed in the correct location first, but then Why this is necessary? r230653 recorded mergeinfo also to share/examples. A snippet from diff: Modified: svn:mergeinfo Merged /head/share/examples:r229831 > I went ahead and did it for you. In share/ I did 'svn propedit > svn:mergeinfo .' and removed the relevant entry. Then in each of the > directories in examples I did, 'svn merge --record-only -c 228931 > $REPO/head/share/examples/ppp .' Thanks, but stable/9/share still has the svn:mergeinfo property after r231856. It didn't have it before r230653. -- Jaakko
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120217063321.GA2273>