The table below lists all the options which can be passed to the image diff tool on the command line. The program is called TortoiseGitIDiff.exe. It has a few more features than the old hunk selection. The image diff tool has a few command line options which you can use to control how the tool is started.
Those new features come at the cost of some added complexity. To properly configure it, we need replace the extdiff and tortoisehg sections as these: cmd.semanticdiff C:\Users\Note that there is no need to explicitly enable the Mercurial Shelve extension when using this feature. Naturally, any line with changed content is always included in the diff. It is now built directly into the Commit tool: According to Steve Borho (lead TortoiseHg developer) in response to a different TortoiseHg question: "We have a local copy of the shelve extension and call into it directly."įor TortoiseHg 2.7+, this functionality has been improved and re-introduced.
Notice in the file list on the left that the top file is checked to indicate it will be included, the second file is unchecked because it will not be included, and the third file, Sample.txt, is filled (the Null checkbox indicator) because only select changes from that file will be included in the commit.
TORTOISEHG LINLINE DIFF DOWNLOAD
The change to Sample.txt that will be included is checked in the lower-right change selection portion of the image. So we have to somehow download TortoiseIDiff.exe from either project, add it to our TortoiseHg folder and add something along those lines into Mercurial. The change that will be excluded is unchecked and the diff view is grayed out. Also notice that the icon for the shelve tool is still readily available. The Mercurial Queues tutorial is terrible for this use case. All the examples I have seen assume you have yet to make a commit and you are refreshing a single patch.
Lets say you have this sort of history: -O-O-A-B-C Most of the time this is not the case, and you have 2 or 3 commits that you want to squash together or change in some other way. The first example is to squash commits A, B, and C.
TORTOISEHG LINLINE DIFF PATCH
Now we need to "import" the commits A, B and C into the patch queue. We can use the "-N" revision syntax to import them like so: $ hg qimport -r -3:-1 TORTOISEHG CHANGE DIFF TOOL PATCH That means import as patches from 3 patches back up to the last commit. You can check the status of these patches with hg qseries.
0 kommentar(er)
