tortoisehg

In mercurial how can I find changesets that contain a string?

左心房为你撑大大i 提交于 2019-12-03 11:20:26
Let's say I have the following revisions: rev 1: + Dim Foo as integer rev 2: + I like big butts, I cannot lie rev 3 - Dim Foo as integer Foo is in rev 1 & 2, and removed from three. What command can I issue that will return all changesets that Foo was added or deleted? Ideally I'd like to be able to do this from toroisehg as well You can use the grep command : hg grep --all Foo To address Lazy Badger concerns in comments. $ hg init $ echo "Dim Foo as integer" > test $ hg commit -m "1" $ echo "I like big butts, I cannot lie" > test $ hg commit -m "2" $ echo "Dim Foo as integer" > test $ hg

How can I remove some commits in Mercurial that were applied to the wrong branch and then replay them on the correct one?

流过昼夜 提交于 2019-12-03 11:03:59
My colleague has committed twice on his repository on the wrong branch. What is the most effective way to take those two commits, get rid of them and then commit them correctly under the right branch? (the changes have not been pushed) We'd ideally like a way to do this from within TortoiseHG but of course, we'll use the command-line if it is the best option. The Mercurial Queues (mq) extension can help. Given a change history that looks like this: @ changeset: 3:9dc681b56325 | summary: file4 | o changeset: 2:6675b3f86aa7 | summary: file3 | | o changeset: 1:4a3209ed5b2f |/ summary: file2 | o

TortoiseHg - How to create patch without commit first

狂风中的少年 提交于 2019-12-03 11:00:54
When I want to create a patch on my local changeset, I really I have to first commit, any I can create the patch. May I know under TortoiseHg, how I can create a patch without performing commit? alexandrul TortoiseHg 2.0.2: in workbench you can right-click on the Working Directory line and select Export / Copy patch from the contextual menu - the resulting diff will be placed in clipboard. Of course, you won't have the changeset header and the commit message at the beginning of the patch like you will get from the same operation made on a commit: # HG changeset patch # User John Doe <john@doe

What's the best way to close a Mercurial branch?

余生颓废 提交于 2019-12-03 10:06:16
Is it better to first close a branch and then merge it with the default branch(for instance) or first merge it and then close it? In TortoiseHg for instance, in the first case, you'll see a line from a close node to the default branch. In the second case you'll see a line from the last commit to the default branch and an extra line from the last commit to a close node. I hope I'm clear. Maybe it's a matter of taste... There is no real difference between the two methods when talking about named branches, at least in any recent version of Mercurial. Things were different pre-1.5(?), but purely

HG: Undo a commit from history

时光毁灭记忆、已成空白 提交于 2019-12-03 08:16:55
问题 I have a HG repository with revs 1, 2, 3, 4, 5 and 6. When I committed rev 4, I unknowingly botched some changes in rev3 that I should not have. I did not notice this until rev 6 was already committed. I need to undo changes in rev 4, but then re-apply all other changes after that. Basically undoing commit #4. How can I do that? 回答1: You want hg backout Revert/undo the effect of an earlier changeset... Backout works by applying a changeset that's the opposite of the changeset to be backed out

Is there any way to change how graphs are drawn in TortoiseHg?

北城以北 提交于 2019-12-03 08:06:18
问题 Being used to how ClearCase draw graphs I find Mercurial's and TortoiseHg's way confusing at first glance. This is how I'd like it to be represented: With static positions for branches. E.g. Maintenance branch to the left/right always and preferably in a straight line and not the current spaghetti curved branch it is now (see below link). This is how it looks using the TortoiseHg Explorer. The graph is from a test repository. :-) Is there any way to change how graphs are drawn in Mercurial?

Disabling HTTPS host authentication in TortoiseHG for internal self-signed certificates

馋奶兔 提交于 2019-12-03 06:38:34
问题 How do you disable HTTPS host authentication in TortoiseHG for internal self-signed certificates. For internal servers HTTPS is primarily used for encryption. The TortoiseHG documentation says that it is possible to disable host verification (i.e. verification against the Certificate Authority chain) here but I can't seem to find the option. Its supposed to be an option when cloning a remote repository. I am using the latest TortoiseHG 2.0.5 回答1: In the TortoiseHG Workbench, in the Sync tab

Hg: How to move files (to subfolder) without losing history?

ぃ、小莉子 提交于 2019-12-03 06:28:24
问题 How to move files (to subfolder) without losing their history? In my Mercurial repository (I mean the folder with the .hg in it) I have MyProject/ folder with all project files. Now I need to create src/ folder inside and move all files to it (from MyProject/ to MyProject/src/ ). How can I do it without losing all history? 回答1: hg mv does do the right thing, but hg log does not list entries past the move unless you give it the -f option. See this question for more info Why 'hg mv' (mercurial)

TortoiseHg Copy Similarity feature

泄露秘密 提交于 2019-12-03 06:20:06
When committing changes to Mercurial, it can auto-detect move/copy/renames by using the command hg addremove -similarity 100 The number after similarity indicates how similar two files need to be from 0-100% for mercurial to decide its a move, copy or rename instead of just a new file. This is a great feature. Can TortoiseHg do this? Yes it can. If you take a look at the TortoiseHg manual you'll find section 4.12 entitled "Rename Guessing". To quote: Select one or more Unrevisioned Files Slide the similarity bar ( Minimum Similarity Percentage ) to the percentage match you want Press either

Use WinMerge as TortoiseHG Merge tool

瘦欲@ 提交于 2019-12-03 05:35:26
问题 I am trying to set up WinMerge as the Merge tool into TortoiseHG; Here is my Mercurial.ini: ; User specific Mercurial config file. ; See the hgrc man page for details. [ui] username = Bargio <> merge = winmergeu [extdiff] cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl [merge-tools] winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe winmergeu.priority= 1 winmergeu.fixeol=True winmergeu.checkchanged=True winmergeu.args= /e /ub /dl