=/Applications/Xcode.app/Contents/Applications/FileMerge. Shelve Improved TortoiseHg 2.0 includes a new shelve tool which is capable of moving changes between your working directory, a shelf file, or an unapplied. Once I had created a series of checkpoints, and had my code into a state where I was unable to unshelve the checkpoints without conflicts, I then used the. =-left $other -right $local -ancestor $base -merge $output When I run hg config, which is supposed to show the combined settings from all hgrc files, it does the following entries, but I do not know where they come from =/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge Pom_merge.executable = /Users/username/codebases/apm/hg/secondbase/tools/hg-tools/pom_merge.pyĮditor="/Applications/kdiff3.app/Contents/MacOS/kdiff3" Pom_merge.args = -o $output $base $local $other Kdiff3.args = $base $local $other -o $output The configuration in ~/.hgrc looks as follows Ĭmd.kdiff3="/Applications/kdiff3.app/Contents/MacOS/kdiff3" to git shelve changes and save local files - Coffee Talk: Java. I do not want hg to use the file merge tool and have not done any change for this to happen except install xcode. The answer to this issue is the git stash command. WebIf you are prepared to move the changes aside, you have another set of. usr/lib/python3/dist-packages/tortoisehg/hgqt/shelve.py. And it is free to use, even in a commercial environment. GUI support is provided for over a dozen operations, including add files, commit changes. It's intuitive and easy to use, since it doesn't require the Subversion command line client to run. If you dont know the exact revision, you can use the log dialog to narrow it down. If you revert an added file, it just becomes untracked so delete file you need to right click file and select Delete Unversioned. TortoiseSVN is an Apache Subversion (SVN) client, implemented as a Windows shell extension. I just upgraded to macOS High Sierra(10.13.4) to install Xcode.īefore the upgrade, my mercurial was set up to use kdiff3 as the diff tool and I was happy with it.Īfter the upgrade, mercurial is now using the file merge tool that comes with xcode. If you only want to revert some of the changes see shelving changes where you can shelve the bits you want to keep, then you can revert file, then you can restore the shelved changes. intro and Dojo Library resources Practical introduction to TortoiseHg (tutorial) Lombiq 1.71K subscribers 25K views 6 years ago A practice-focused introduction to the most important features of. RepoLookupError: unknown revision 'C:\Users\USER\CODE.hg\shelves.This is perhaps a question for hg as much as it is for macOS. ** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) įile "tortoisehg\hgqt\workbench.pyo", line 532, in forwarderįile "tortoisehg\hgqt\repowidget.pyo", line 500, in shelveįile "tortoisehg\hgqt\shelve.pyo", line 189, in initįile "tortoisehg\hgqt\shelve.pyo", line 414, in refreshCombosįile "tortoisehg\hgqt\shelve.pyo", line 441, in comboBChangedįile "tortoisehg\hgqt\thgrepo.pyo", line 249, in changectxįile "mercurial\localrepo.pyo", line 581, in changectxįile "mercurial\localrepo.pyo", line 206, in getitemįile "mercurial\context.pyo", line 27, in initįile "mercurial\localrepo.pyo", line 556, in lookup ** Extensions loaded: fixfrozenexts, rebase, mq, hgk, graphlog, churn, histedit, hgsubversion, eol, mercurial_keyring, purge However, something explodes all over the in the Workbench. Fortunately, I had saved them, but I thought I'd save myself the trouble in the future and init a repo so I could version my changes to the shelf, much the same way some people init a repo of MQ patchsets. However, I had a scare when I thought I may have accidentally blown my shelves away. Created originally on Bitbucket by Anonymous
0 Comments
Leave a Reply. |