When I unshelve, it uses mercurial's merge capability, but I'm not seeing any way to get back the original shelved patch and redo things if I've completed the merge with an error. Aside from searching backup drives, is there any way to do that? (either to undo the unshelve action and put the shelf back, or to see what was in the patch file)
Is there a way to get a mercurial shelf back after a merge mistake?
375 Views Asked by Joshua Goldberg At
1
There are 1 best solutions below
Related Questions in VERSION-CONTROL
- Setting up the version control of .dotfiles while the .config is connected to a forked repo
- How can i redirect pull request from main branch to another branch
- Visual Studio 2022 convert spaces to tabs on checkout and back to spaces on checkin
- Handle workspace/monorepo with different deployments
- P4 change ownership through command line
- gitignore for Unity VR project does not work
- Different SDK for specific build
- Sourcetree GUI : Why main branch is behind another branch? Is it normal?
- Strongly Connected Components Using Kosaraju Algorithm
- How to use git-credential-gopass with git send-email?
- Run Robot in Jenkinsfile does not fetch the correct test.robot file from Github
- Git Hub not showing my Organization's Repositories in Android Studio
- Sourcetree caches old branches that no longer exist on github. I do not want this
- How to retrieve Inference image location for my Sagemaker pytorch custom model for Model registry
- I have an error with my Material UI react-swipeable-views in TypeScript
Related Questions in MERCURIAL
- "Mercurial only supports encoded strings" error?
- Mercurial: Uncommitted local changes are detected while there are none
- How to prevent CMake rerun after CMakeLists.txt changed?
- Using Beyond Compare with Mercurial as the external diff tool to perform in-place directory comparison
- Mercurial/TortoiseHg: Can multiple repositories share the exact same file(s)?
- Is there any way to use hg copy from a specific revision?
- Mercurial in WSL: HGEDITOR $PATH is different from my $PATH
- PYTHONHOME environment variable is unset and empty, I don't know what put to have my python related command working again on linux
- Pushing to local phabricator with TortoiseHG produces Error
- How to prevent a mercurial commit with no files specified (prevent commiting all modified files) using a hook
- What does `hg cp` do and how to "undo" it?
- Reliably run Mercurial's "hg status" from a C# program
- How to uncommit one file in a series of commits in TortoiseHG (Mercurial)?
- Finding changes to a block of text with mercurial
- UnicodeDecodeError while pulling in mercurial (hg) UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 4: ordinal not in range(128)
Related Questions in UNSHELVE
- How do I find my shelved changes in tfs Visual Studio 2008?
- TortoiseSVN - Recover content of shelved files
- Pycharm - Shelved Changes... now I'd like it back
- p4 unshelve doesn't bring new added files
- TFS 2017/VS 2017 unshelve to different branch, alternatively create a branch from "Main" with saved, uncommitted changes
- How to create a fresh Shelve Changelist in Perforce
- Shelves in Tortoise and Mercurial command line don't seem to interoperate?
- How to get a shelve set from closed review
- Unshelve a file which is in exclusive check out in Perforce/P4
- Batch - Remove Range/specific words
- Is there a way to get a mercurial shelf back after a merge mistake?
- Unshelve throws "No appropriate mapping exists" error then works when I try again
- Unshelving changes in Visual Studio
- Perforce - How to remove a file from a shelved changelist?
- The shelveset could not be unshelved
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular # Hahtags
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
I found it — by looking around in the
.hgdirectory. Simply find the directory.hg/shelve-backup/. The original patch is written there.I now see this is mentioned in
hg help unshelvethough I had missed it before now (and it does not say the name of the directory)