From owner-svn-src-all@FreeBSD.ORG  Mon Dec 29 19:20:20 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AEB51121;
 Mon, 29 Dec 2014 19:20:20 +0000 (UTC)
Received: from mail-ig0-x22e.google.com (mail-ig0-x22e.google.com
 [IPv6:2607:f8b0:4001:c05::22e])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 74B741EA8;
 Mon, 29 Dec 2014 19:20:20 +0000 (UTC)
Received: by mail-ig0-f174.google.com with SMTP id hn15so11646870igb.1;
 Mon, 29 Dec 2014 11:20:19 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date:message-id
 :subject:to:cc:content-type;
 bh=n3XcZyYHf4sA3A/VeLMozbFbXO0+R63/ynKkXttgKNg=;
 b=KpxU+jX2OSr644gPGiFL1IBRnM/k9ttzrmB1gXYaHHOAkn7UrEnr54zCtWd6V8wQu7
 wegYgFVS3u0Uqcm9G27arpGcaDkH/wvNVZoQc6sDnrtpzF71TB/6AmaN0+AuJ2fBdLi7
 eZq0P1zLqVL7AjPmORAbdOVThU0bSwAwLRUjuYW3nhaGK8lKz4WvI7x+0JBBPWoHXoyg
 0agPySSuOwHgSCHIRdxfxEhoG7xgCppS1KAnduOjcwG2yhSiwFmHTcKT8j9swpikRisl
 SY39yAGOvS59Y/XS5kx58KVcc3xM/egooO9LnDJzUMOG1n34wjc9L925TX5tKFSMxdWn
 Gblg==
X-Received: by 10.107.25.74 with SMTP id 71mr51828521ioz.70.1419880819763;
 Mon, 29 Dec 2014 11:20:19 -0800 (PST)
MIME-Version: 1.0
Sender: carpeddiem@gmail.com
Received: by 10.107.0.85 with HTTP; Mon, 29 Dec 2014 11:19:59 -0800 (PST)
In-Reply-To: <BFD42EAB-CB09-47E3-A474-E8251883D931@gmail.com>
References: <201412291902.sBTJ218x095737@svn.freebsd.org>
 <BFD42EAB-CB09-47E3-A474-E8251883D931@gmail.com>
From: Ed Maste <emaste@freebsd.org>
Date: Mon, 29 Dec 2014 14:19:59 -0500
X-Google-Sender-Auth: Eke188Qv15IZOfzpe7lE2jq6EAA
Message-ID: <CAPyFy2C=XJBQ-s1sdSZMXRBb7VDdozz3LpjGBqpRSoHRCC9yRA@mail.gmail.com>
Subject: Re: svn commit: r276369 - head
To: Garrett Cooper <yaneurabeya@gmail.com>
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Dec 2014 19:20:20 -0000

On 29 December 2014 at 14:07, Garrett Cooper <yaneurabeya@gmail.com> wrote:
> On Dec 29, 2014, at 11:02, Ed Maste <emaste@FreeBSD.org> wrote:
>
>> Author: emaste
>> Date: Mon Dec 29 19:02:00 2014
>> New Revision: 276369
>> URL: https://svnweb.freebsd.org/changeset/base/276369
>>
>> Log:
>>  Merge elftoolchain directory shuffling from elftoolchain update branch
>>
>> Modified:
>> Directory Properties:
>>  head/   (props changed)
>
> Hi Ed,
> Was merging just the mergeinfo intentional?

I was not expecting any file content changes, so I suppose so. I might
have expected Subversion to list the directory content replacements as
with the corresponding change on the branch (r276164).