Heads up about potential update-checkout failures for fetches from the clang, llvm, compiler-rt, libcxx, clang-tools-extra, lldb repos

After some llvm-project monorepo preparation work @dexonsmith and I did yesterday, your update-checkout fetches for https://github.com/apple/swift-{clang,llvm,compiler-rt,libcxx,clang-tools-extra,lldb} might fail with errors that are similar to the one shown below:

From https://github.com/apple/swift-compiler-rt
   ! [rejected]            apple/swift-5.1-branch/start -> apple/swift-5.1-branch/start  (would clobber existing tag)

Unfortunately this is caused by a couple of force pushes to tags we had to do yesterday to mark the starting points of the different historical branches that are needed for the monorepo transition.

If you hit this issue, and re-running update-checkout doesn’t resolve this problem, you should be able to resolve the problem by either:

  • Deleting the problematic tags in clang, llvm, compiler-rt, libcxx, clang-tools-extra, lldb:
    git tag | grep "apple/" | xargs -L1 git tag -d
    And re-running update-checkout.

  • Deleting the clang, llvm, compiler-rt, libcxx, clang-tools-extra, lldb checkouts, and re-running update-checkout.

Apologies for any inconvenience caused by this. We will not be doing any additional forced tag updates.

1 Like