tortoisehg | 易学教程

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

阅读更多关于 In mercurial how can I find changesets that contain a string?

问题 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 回答1: 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" $

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

阅读更多关于 What's the best way to close a Mercurial branch?

问题 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... 回答1: There is no real difference between the two methods when talking about

TortoiseHg - How to create patch without commit first

阅读更多关于 TortoiseHg - How to create patch without commit first

问题 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? 回答1: 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

HG Convert on SVN gives “does not look like a Subversion Repository”

阅读更多关于 HG Convert on SVN gives “does not look like a Subversion Repository”

I just installed TortoiseHG v2.11 with Mercurial-2.9 I am attempting to convert my local Subversion repositories created with TortoiseSVN 1.8. 4, Subversion 1.8.5 To be sure that my old Subversion repositories don't have any weird quirks I created a new SVN repo called test_repo with the default folder structure, performed a Checkout to test_repowc, then added some text files to the trunk, then modified and committed the files a few times to provide some history. I then opened cmd.exe, navigated to the folder and tried hg convert test_repo and got the following: assuming destination test_repo

How do I convert a git repository to mercurial?

阅读更多关于 How do I convert a git repository to mercurial?

问题 I've been developing a java application using git as source code repository. I'd like to share the project with other java developers and hg seems to be most used by them. My question is how do I convert a git repository to hg? If I tried googling "convert git to hg" and every search hit is about converting from hg to git. I'm also using TortoiseHg. 回答1: The hg convert utility isn't on by default after installation. In order to set it as such add the following to your .hgrc file. [extensions]

TortoiseHg change default .hg folder location

阅读更多关于 TortoiseHg change default .hg folder location

问题 Is it recommend to change the default .hg folder location to a central place? Instead of having the .hg folder stored under working directory. Since I have accidentally shift-deleted the working directory and lost all commit history. Is there any way to change the default .hg folder location in TortoiseHg? Or any recommendation on backing up the repo? And how? 回答1: AFAIK, changing the location of the .hg folder is not possible. The presence of a .hg folder indicates that a given folder is a

TortoiseHg: Push Branch

阅读更多关于 TortoiseHg: Push Branch

I am working on some bugs in our code base and I have created separate branches for each bug. I have rebased one of the branches on top of default. I generally use the mercurial plugin for Eclipse and I would do a push (when I am in the default branch). This pushes my changes on the default branch. I tried to do the same thing with TortoiseHg. When I press push, the client complains that I am about to create remote heads/create new branches on the server. Is there some way to push only changes on one branch using TortoiseHg? Thanks for your answers! Tim Henigan The easiest way to do this is

How to delete remote commit from bitbucket mercurial repository

阅读更多关于 How to delete remote commit from bitbucket mercurial repository

How to delete a remote commit from bitbucket mercurial repository? Findings: I could not found "Repository management" in the "Admin" section. which is mentioned in this answer . Is this feature deprecated/dropped from bitbucket? If not where it is? Note that I am owner of the repository. Note for expert! only: Remember I have already pushed my commit to bitbucket. I know deleting commit is not good, I am not interested to a backout my history by adding an extra commit. Moreover I can ensure you that someone will strip the commit manually from every local clone of this repo. So you don't have

How to recover files that have been deleted from shelf in tortoisehg program?

阅读更多关于 How to recover files that have been deleted from shelf in tortoisehg program?

I was trying to delete an individual file from my shelf and it turns out the delete button deletes all of the files in the shelf instead. Is there a way to recover these files besides going into .hg/Trashcan and trying to remember which of those files were deleted? The best way to do this, as you alluded to, is to go into the .hg/Trashcan and copy the shelf file back into the .hg/shelves folder. Obviously if you order or list the trashcan folder by date you should be able to see which was the one you deleted by accident! 来源： https://stackoverflow.com/questions/17372525/how-to-recover-files

Excluding a file while merging in Mercurial

阅读更多关于 Excluding a file while merging in Mercurial

问题 I use Mercurial with TortoiseHg. I have two branches ( A and B ) with two files ( toto.cs and titi.cs ). Is there a way, when I want to merge B with A , to exclude titi.cs from merging, and only merge toto.cs ? If it's possible, how can I do that? 回答1: Sure. Not merging titi.cs is really just using titi.cs exactly as it exists in A or in B (your choice). You could do that manually like this: hg update A hg merge B hg revert --rev A titi.cs (swap A and B to go the other direction). Or you