[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-docs
Subject:    Re: conflict trunk branch
From:       Luca Toscano <toscano.luca () gmail ! com>
Date:       2016-03-16 7:31:53
Message-ID: CAFedD43yQu9FedtsYkU7oGS1dBjqDQbB17pUhJ53zro=iy7ANw () mail ! gmail ! com
[Download RAW message or body]

Hi!

2016-03-16 4:55 GMT+01:00 William A Rowe Jr <wrowe@rowe-clan.net>:

> The general answer is 'svn revert' on the missing file, but this was more
> complicated, it seems.
>
> Hopefully, all is well now?
>
> On Tue, Mar 15, 2016 at 1:09 PM, Eric Covener <covener@gmail.com> wrote:
>
>> On Tue, Mar 15, 2016 at 1:54 PM, Lucien Gentis
>> <lucien.gentis@univ-lorraine.fr> wrote:
>> > Due to a conflict with manual/howto/http2.xml.meta and
>> > manual/howto/http2.html, this files have been deleted accidentally.
>>
>> I think I've restored them in r1735153.
>
>
I believe that this conflict might have been triggered by me with r1735114
(reverted in 1735115). I thought my local merge was fine but I didn't
properly check svn diff ending up in removing stuff that Stefan already
wrote. A lot of lesson learned about how to make changes like this one in
the future :)

In case it was me, apologies!!

Luca

[Attachment #3 (text/html)]

<div dir="ltr">Hi!<br><div class="gmail_extra"><br><div \
class="gmail_quote">2016-03-16 4:55 GMT+01:00 William A Rowe Jr <span \
dir="ltr">&lt;<a href="mailto:wrowe@rowe-clan.net" \
target="_blank">wrowe@rowe-clan.net</a>&gt;</span>:<br><blockquote \
class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div \
dir="ltr">The general answer is &#39;svn revert&#39; on the missing file, but this \
was more complicated, it seems.<div><br></div><div>Hopefully, all is well \
now?</div></div><div class=""><div class="h5"><div class="gmail_extra"><br><div \
class="gmail_quote">On Tue, Mar 15, 2016 at 1:09 PM, Eric Covener <span \
dir="ltr">&lt;<a href="mailto:covener@gmail.com" \
target="_blank">covener@gmail.com</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><span>On \
Tue, Mar 15, 2016 at 1:54 PM, Lucien Gentis<br> &lt;<a \
href="mailto:lucien.gentis@univ-lorraine.fr" \
target="_blank">lucien.gentis@univ-lorraine.fr</a>&gt; wrote:<br> &gt; Due to a \
conflict with manual/howto/http2.xml.meta and<br> &gt; manual/howto/http2.html, this \
files have been deleted accidentally.<br> <br>
</span>I think I&#39;ve restored them in \
r1735153.</blockquote></div></div></div></div></blockquote><div><br></div><div>I \
believe that this conflict might have been triggered by me with r1735114 (reverted in \
1735115). I thought my local merge was fine but I didn&#39;t properly check svn diff \
ending up in removing stuff that Stefan already wrote. A lot of lesson learned about \
how to make changes like this one in the future :)</div><div><br></div><div>In case \
it was me, apologies!!</div><div><br></div><div>Luca   </div></div><br></div></div>



[prev in list] [next in list] [prev in thread] [next in thread]