Ok. I've fixed the repo (I think). I put the fixed repo back, but the repo is still read-only until I have at least one person double check my work.
All of this only affects you if you have changeset 330f8109b199 (from Nov 17th) in your tree. If you don't, you're fine. Here's what I did: hg export 330f8109b199 > ../bad.diff <remove the bad stuff from bad.diff and call it good.diff> ### WARNING. Turn off the style hook!!! before you rebase. hg update -C e66a566f2cfa hg import ../good.diff hg rebase --detach --source b64c3d2348cb --dest 8b532495bf80 hg strip 330f8109b199 IThe simplest thing to do is blow away your repo and re clone. The second simplest thing to do is: hg qpop -a hg strip 330f8109b199 hg pull -u If you have a tree that has unpushed changes on top of the bad one (330f8109b199), then it's a bit more difficult. You can basically pull (creating two heads), rebase your changes (as above), and then strip 330f8109b199 (which should have nothing derived from it after you've rebased.) The one case that I can think of that will be a bit more difficult is if anyone has more than one changeset with 330f8109b199. In that case, you'd want to rebase each one. gem5.sefs is a case of this. Gabe, let me know if you need any help. Any questions? Nate _______________________________________________ gem5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/gem5-dev
