<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
What does the resulting history look like? Should those of us
downstream expect to have horrible merge experiences?<br>
<br>
p.s. What went wrong?<br>
<br>
<div class="moz-cite-prefix">On 01/07/2015 02:03 PM, Eric
Christopher wrote:<br>
</div>
<blockquote
cite="mid:CALehDX4OfrzTHJ-c9OwKva9+7-k3pBjL0rxcyk=ZaQ9i=S4YSg@mail.gmail.com"
type="cite">This has now been fixed.<br>
<br>
-eric<br>
<br>
<div class="gmail_quote">On Wed Jan 07 2015 at 2:01:18 PM Sean
Silva <<a moz-do-not-send="true"
href="mailto:chisophugis@gmail.com">chisophugis@gmail.com</a>>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">Seeing this on my side too, and I committed the
patch (it was a 1-line change!)</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On Wed, Jan 7, 2015 at 1:52 PM,
H.J. Lu <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:hjl.tools@gmail.com" target="_blank">hjl.tools@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">This
git commit:<br>
<br>
commit 3163ef873d810ab680cc3525e06b478e747eb32a<br>
Author: Sean Silva <<a moz-do-not-send="true"
href="mailto:chisophugis@gmail.com" target="_blank">chisophugis@gmail.com</a>><br>
Date: Wed Jan 7 21:35:14 2015 +0000<br>
<br>
[LangRef] PR22118: Hyphen is allowed in IR
identifiers.<br>
<br>
E.g. %-foo and %fo-o.<br>
<br>
Thanks to eagle-eyed reporter Tomas Brukner.<br>
<br>
git-svn-id: <a moz-do-not-send="true"
href="https://llvm.org/svn/llvm-project/llvm/trunk@225400%0D91177308-0d34-0410-b5e6-96231b3b80d8"
target="_blank">https://llvm.org/svn/llvm-project/llvm/trunk@225400<br>
91177308-0d34-0410-b5e6-96231b3b80d8</a><br>
<br>
seems to wipe out the whole git llvm trunk. What is
going on?<br>
<span><font color="#888888"><br>
<br>
--<br>
H.J.<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a moz-do-not-send="true"
href="mailto:llvm-commits@cs.uiuc.edu"
target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a moz-do-not-send="true"
href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits"
target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</font></span></blockquote>
</div>
<br>
</div>
_______________________________________________<br>
llvm-commits mailing list<br>
<a moz-do-not-send="true"
href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a moz-do-not-send="true"
href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits"
target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
llvm-commits mailing list
<a class="moz-txt-link-abbreviated" href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a>
<a class="moz-txt-link-freetext" href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a>
</pre>
</blockquote>
<br>
</body>
</html>