Is http://llvm.org/git/llvm.git trunk wipped out?

Ramkumar Ramachandra artagnon at gmail.com
Wed Jan 7 14:36:32 PST 2015


Philip Reames wrote:
> What does the resulting history look like?

You can see 3163ef on git://github.com/llvm-mirror/llvm (it seems to
be stuck there): that's the bad commit which removes everything
basically.

The history has been rewound and rewritten to 699e5d7 on
http://llvm.org/git/llvm.git -- that's the good version of the 3163ef
commit. If you fetched the bad change, you have to git reset --hard
<remote>/master on your master, and everything will be fine; you can
rebase all your changes onto that.

> Should those of us downstream
> expect to have horrible merge experiences?

Unless you fetched the bad change and refuse to reset to the rewritten
history, no.

> p.s. What went wrong?

I hope someone can fill us in on this, so we can write to git@ about it.



More information about the llvm-commits mailing list