Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Message-ID: <547DD4E1.2090103@rcbowen.com>
Date: Tue, 02 Dec 2014 10:04:01 -0500
From: Rich Bowen <rbowen@rcbowen.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
 rv:31.0) Gecko/20100101 Thunderbird/31.1.1
MIME-Version: 1.0
To: dev@httpd.apache.org
Subject: Re: svn:mergeinfo from docs/manual/rewrite/advanced.xml
References: 
 <CAKQ1sVOiQaUhgqXRnJO6GaHN2t5rmwU3Hhj9vB-aO5i-TuoNyQ@mail.gmail.com>
 <CALK=YjOx2CHMR1qBOYoXWBGeWT_C4gSktB=yDXHmDjipT=j+pA@mail.gmail.com>
In-Reply-To: 
 <CALK=YjOx2CHMR1qBOYoXWBGeWT_C4gSktB=yDXHmDjipT=j+pA@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit


On 12/02/2014 09:56 AM, Eric Covener wrote:
> On Tue, Dec 2, 2014 at 8:57 AM, Yann Ylavic <ylavic.dev@gmail.com> wrote:
>> Hi,
>>
>> it seems that anytime I try to merge something from trunk into my
>> working 2.4.x, it produces a mergeinfo for
>> docs/manual/rewrite/advanced.xml.
>>
>> What's mergeinfo "policy" in httpd? Is that expected?
>>
>
> I am probably guilty of not doing merges correctly, causing mergeinfo
> to be omitted. I think Greg had guided us to always merge into a clean
> tree and commit "."
>
> But there did seem to be a huge influx of mergeinfo from rbowens
> r1622292 including the one giving you a problem.  I can't imagine that
> specific instance of the data is serving any purpose
>


Sorry about that. Not sure what I did there. :(

-- 
Rich Bowen - rbowen@rcbowen.com - @rbowen
http://apachecon.com/ - @apachecon