On Sat, Nov 5, 2011 at 8:51 AM, Andriy Gapon <[email protected]> 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 [email protected] _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
