KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
Commited work. Did a rollback when I wasn't on the tip of the repo. Lost files. Looking for git reflog equivalent to save my work. Long: So I finish work, then commit. $ hg commit -A [...] adding media/js/fbfriends.js removing media/js/streams.js adding media/js/templetizer.js [...] $ hg log $ hg log changeset: 10:ce3ad416d9a5 tag: tip user: Mihai date: Sat Sep 10 22:34:35 2011 -0700 summary: Save all. changeset: 9:ceacb7b2192a user: Mihai date: Sat Sep 10 22:25:34 2011 -0700 summary: Mootools update. [...] Some browsing: $ hg checkout 8 Okay. Then I wanted to change revision 10. Stupidly, I do: $ hg rollback rolling back to revision 9 (undo commit) $ hg status [...] M media/js/mootools.js R media/js/streams.js ! media/js/fbfriends.js ! media/js/templetizer.js [...] WTF? Where did my two files go???? $ hg log changeset: 9:ceacb7b2192a tag: tip user: Mihai date: Sat Sep 10 22:25:34 2011 -0700 summary: Mootools update. [...] Okay, i'll figure out the .orig files: $ hg revert --all [...] undeleting media/js/streams.js forgetting media/js/templetizer.js reverting media/js/mootools.js [...] // media/js/fbfriends.js doesn't even show up $ hg status ? media/js/mootools.js.orig $ hg history changeset: 9:ceacb7b2192a tag: tip user: Mihai date: Sat Sep 10 22:25:34 2011 -0700 summary: Mootools update. NOOOOOO! I've been royally fscked for being on commit 8 when i did the rollback. Recovery attempts fail: $ hg checkout 10 8 files updated, 0 files merged, 0 files removed, 0 files unresolved $ find -name temp $ hg checkout 9 30 files updated, 0 files merged, 63 files removed, 0 files unresolved $ find -name temp $ hg checkout ce3ad416d9a5 abort: unknown revision 'ce3ad416d9a5'! $ hg
Tags (comma-separated)
Save Edits
Cancel