<div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr">I still see those revisions in my local clone, FWIW...</div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Thu, Sep 6, 2018 at 11:15 AM Stephen Kelly via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
I also got a forced update just now, but I use split repos.<br>
<br>
I think someone force pushed in order to remove a commit "[libFuzzer] <br>
Port to Windows" and it's reversion?<br>
<br>
Thanks,<br>
<br>
Stephen.<br>
<br>
On 06/09/18 16:17, Nico Weber via llvm-dev wrote:<br>
> Here's official master:<br>
> <a href="https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209" rel="noreferrer" target="_blank">https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209</a><br>
> <br>
> Here's master on my fork:<br>
> <a href="https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34" rel="noreferrer" target="_blank">https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34</a><br>
> <br>
> Things are identical until "[Sparc] allow tls_add/tls_call syntax in <br>
> assembler parser". On official master, it's followed by "[OpenCL] <br>
> Traverse vector types for ocl extensions support" and then "[AArch64] <br>
> Simplify code in LowerGlobalAddress. NFCI.", while on my fork it's <br>
> followed by "[AArch64] Simplify code in LowerGlobalAddress. NFCI." <br>
> immediately.<br>
> <br>
> Normally I'd say I just held git wrong, but the commit hashes of my copy <br>
> also exist on the official llvm-project master.<br>
> <br>
> If nobody else sees weirdness it's probably all good.<br>
> <br>
> On Thu, Sep 6, 2018 at 11:04 AM Nico Weber <<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a> <br>
> <mailto:<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>>> wrote:<br>
> <br>
>     Hi,<br>
> <br>
>     I got a forced update when pulling today. If I merge master to a<br>
>     local branch, I get a bunch of add/add conflicts.<br>
> <br>
>     This same commit exists under several hashes:<br>
>     <a href="https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505" rel="noreferrer" target="_blank">https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505</a><br>
>     <a href="https://github.com/llvm-project/llvm-project-20170507/commit/74725885552" rel="noreferrer" target="_blank">https://github.com/llvm-project/llvm-project-20170507/commit/74725885552</a><br>
> <br>
>     Did someone push -f to the monorepo after doing branch surgery?<br>
> <br>
>     Maybe there was a PSA somewhere that I missed?<br>
> <br>
>     Thanks,<br>
>     Nico<br>
> <br>
> <br>
> <br>
> _______________________________________________<br>
> LLVM Developers mailing list<br>
> <a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
> <br>
<br>
<br>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote></div>