[llvm-dev] Did anything weird happen to the git monorepo? (original) (raw)

Nico Weber via llvm-dev llvm-dev at lists.llvm.org
Thu Sep 6 08:17:43 PDT 2018

Here's official master: https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209

Here's master on my fork: https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34

Things are identical until "[Sparc] allow tls_add/tls_call syntax in assembler parser". On official master, it's followed by "[OpenCL] Traverse vector types for ocl extensions support" and then "[AArch64] Simplify code in LowerGlobalAddress. NFCI.", while on my fork it's followed by "[AArch64] Simplify code in LowerGlobalAddress. NFCI." immediately.

Normally I'd say I just held git wrong, but the commit hashes of my copy also exist on the official llvm-project master.

If nobody else sees weirdness it's probably all good.

On Thu, Sep 6, 2018 at 11:04 AM Nico Weber <thakis at chromium.org> wrote:

Hi,

I got a forced update when pulling today. If I merge master to a local branch, I get a bunch of add/add conflicts. This same commit exists under several hashes: https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505 https://github.com/llvm-project/llvm-project-20170507/commit/74725885552 Did someone push -f to the monorepo after doing branch surgery? Maybe there was a PSA somewhere that I missed? Thanks, Nico -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20180906/e59de1d0/attachment.html>

More information about the llvm-dev mailing list