From owner-svn-src-head@FreeBSD.ORG Sat Nov 5 19:47:02 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 737001065672; Sat, 5 Nov 2011 19:47:02 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 8FB108FC23; Sat, 5 Nov 2011 19:47:00 +0000 (UTC) Received: by bkbzs8 with SMTP id zs8so266831bkb.13 for ; Sat, 05 Nov 2011 12:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=5jKI65h8jAXgBVV00nv5/bOow3kebirBS2sfped+Eeg=; b=vw/qBAzUpPWLv6yHskFdMwVQ9fHDbXlG824clojehXWP+GG7Oa9Q8DzCCD6FpZvtfH BaBgpXsQght+3VSJWU7QnvNcItnU62+6wLMM3zQJwx3yeqvCGneyldlLxIG6S/lGqwPn myPMkKtxQsGwiyX0tqPEBzjtMRe3UVE9hPK38= MIME-Version: 1.0 Received: by 10.204.16.67 with SMTP id n3mr15195485bka.6.1320522419863; Sat, 05 Nov 2011 12:46:59 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.39.12 with HTTP; Sat, 5 Nov 2011 12:46:59 -0700 (PDT) In-Reply-To: <4EB55B99.2000308@FreeBSD.org> References: <4EB55B99.2000308@FreeBSD.org> Date: Sat, 5 Nov 2011 12:46:59 -0700 X-Google-Sender-Auth: eNgAvLMN5tvtW6Nmw2ZLXSsd3-8 Message-ID: From: Craig Rodrigues To: Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, src-committers@freebsd.org, Dimitry Andric , svn-src-stable-9@freebsd.org Subject: Re: mergeinfo under sys/boot? X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2011 19:47:02 -0000 On Sat, Nov 5, 2011 at 8:51 AM, Andriy Gapon 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