![]() and it was rebased to be built on top of other people's commits from 6 hours ago. Latest commit was 11 minutes old, was the work i'd done. Looking in tortoise again - it looked good. I ran: hg recover 'C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-98774a32-rebase.hg'Īdded 45 changesets with 403 changes to 360 files Missing from this graph is everyone else's commits in those 8 days, and my local commits. the point the rebase would've had to "roll back" to. The revision prior to that is from 8 days ago - it's my last push - i.e. The current working directory is disconnected from all before it and has a big red "not a head revision" tag. Warning: ignoring unknown working parent f6a8bec6d092! Here's what I get from stat at the moment. Regarding this: strip failed, backup bundle stored in 'C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-98774a32-rebase.hg' But my VS instance wasn't touching that area or anywhere near it. Most likely it was onedrive that got its mits on the thing. I think the file wasn't being used by me or any of my apps. The most pertinent parts are: (fix the problem, then recover the changesets with "hg unbundle 'C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-3ac4a696-temp.hg'")Īnd "The process cannot access the file because it is being used by another process" (fix the problem, then recover the changesets with "hg unbundle 'C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-3ac4a696-temp.hg'")Ībort: C:\Source\MonoRepo\.hg/store\data/_folder/_project_alpha._tests/_fakes_assemblies/_fakesconfig.i: The process cannot access the file because it is being used by another process Strip failed, unrecovered changes stored in 'C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-3ac4a696-temp.hg' Strip failed, backup bundle stored in 'C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-98774a32-rebase.hg' Saved backup bundle to C:\Source\MonoRepo\.hg\strip-backup/8c87dc84658a-98774a32-rebase.hg Rebasing 1725:ccb07e7d5eb2 "Some changes3" > hg pull -rebaseĪdded 40 changesets with 93 changes to 70 files (+1 heads) Here's the complete story of what happened (may include error messages that you also experience) Background story ![]() The backup of the repo (step 1) also meant I could try other things if this had failed. I was worried I would lose my commits when I did this, but I did not. If that doesn't work, try hg rebase -abort.Perform any hg unbundle commands that the error message recommends.Make a local backup of your repo, in another folder.If you get an error message such as: transaction abort! * How to recover when a rebase goes wrong? ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |