Date: Sat, 5 Nov 2011 12:46:59 -0700 From: Craig Rodrigues <rodrigc@crodrigues.org> To: Andriy Gapon <avg@freebsd.org> Cc: svn-src-head@freebsd.org, src-committers@freebsd.org, Dimitry Andric <dim@freebsd.org>, svn-src-stable-9@freebsd.org Subject: Re: mergeinfo under sys/boot? Message-ID: <CAG=rPVeF3079S6hsZGB3%2BQAhX5VhqMjGKNRFLpu%2B4GdBanmYhw@mail.gmail.com> In-Reply-To: <4EB55B99.2000308@FreeBSD.org> References: <4EB55B99.2000308@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Nov 5, 2011 at 8:51 AM, Andriy Gapon <avg@freebsd.org> wrote:
>
> Looks like we have mergeinfo property on a bunch of files under sys/boot in head
> and stable/9.
> At least the following are affected:
> sys/boot/powerpc/boot1.chrp
> sys/boot/powerpc/ofw
> sys/boot/i386/efi
> ...
>
> Not sure if that mergeinfo is useful for anything.
> It seems that it was added to head in r218822 ("Merge binutils 2.17.50 to head").
Hi,
I don't know the solution to this particular mergeinfo problem.
However, I advise anyone
committing to the FreeBSD repository and doing "svn merge" should
definitely update
to the latest svn 1.7.1 port.
According to the subversion 1.7 release notes:
http://subversion.apache.org/docs/release-notes/1.7.html
"Reduced subtree mergeinfo changes
Merges no longer record mergeinfo (describing the merge) on
subtrees (that have their own explicit mergeinfo), if the
subtree was unaffected by the merge. This should greatly reduce
the number of spurious svn:mergeinfo property changes
for users who have large numbers of subtrees with explicit mergeinfo."
I have tried subversion 1.7.1, and followed the FreeBSD merging guidelines at:
http://wiki.freebsd.org/SubversionPrimer/Merging, and verified that
it is true, which is very nice for doing "svn merge".
--
Craig Rodrigues
rodrigc@crodrigues.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVeF3079S6hsZGB3%2BQAhX5VhqMjGKNRFLpu%2B4GdBanmYhw>