tortoisehg

问题 I am starting to use Mercurial: 1.) I pulled the latest updates from public (central) repository (revision 3029) 2.) Working on code, I made a commit - revision 3030 3.) Some additional work, and - I made another commit 3031. So, both of my commits 3030 and 3031 are in a local repository. At this stage my local repo looks like this There are no commits by other people in Central repository. I am finished at this point, and submit the code for code review - my reviewer tells me that there

问题 I am starting to use Mercurial: 1.) I pulled the latest updates from public (central) repository (revision 3029) 2.) Working on code, I made a commit - revision 3030 3.) Some additional work, and - I made another commit 3031. So, both of my commits 3030 and 3031 are in a local repository. At this stage my local repo looks like this There are no commits by other people in Central repository. I am finished at this point, and submit the code for code review - my reviewer tells me that there

问题 In Mercurial (preferably via TortoiseHG interface) is it possible to copy a committed file, and for the new destination file to share the history for the source file? I'm pretty sure this is not possible, but I'm asking in the hope that it's just really well hidden in the documentation. I have a file with a fairly long history of changes, but I now need to have have a 2nd copy of this file within the project which will contain it's own individual changes. However, it would be exceedingly

问题 Often after committing changes, I do a pull, before pushing my changes, and someone has already committed changes. I could do another (merge) commit, but where possible I like to maintain linear history, as it makes things a bit easier to read. So how does one rebase a changeset using tortoisehg, without resorting to using the command line? 回答1: First enable rebase: File -> Settings -> Extensions Then (after restarting tortoisehg) Update to the changeset you want to rebase on to. Right click

问题 This question already has answers here : Closed 9 years ago . Possible Duplicate: Is it possible to edit a summary after a commit using TortoiseHg? In Mercurial, if I forget to include the defect # in a check-in summary, how do you change the summary of a previously checked-in changeset, besides tweaking a flat-file and checking in a subsequent changeset just to comment on the previous check-in? Using TortoiseHG. 回答1: the appropriate way to do this is to use histedit. Histedit allows you to

问题 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. 回答1: The Mercurial Queues (mq) extension can help. Given a change history that looks like this: @ changeset: 3:9dc681b56325 | summary:

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

问题 When getting the latest code from a Mercurial repo on the command line, if there are changesets that need to be merged Mercurial raises a warning: hg up abort: crosses branches (merge branches or use --check to force update) This is what I expect, and from the Mercurial book it says "Mercurial is telling us that the hg update command won't do a merge; it won't update the working directory when it thinks we might want to do a merge, unless we force it to do so." At this point I know I need to

问题 It's happened more than a few times that I'll commit a bit of code, then forget to actually push the code over to our remote repository (until my boss tells me that XYZ still doesn't work, and I feel silly). Is there any way to have Tortoise display committed code that hasn't been pushed differently? Ideally I'd love it if there was a way to get such changesets to show with a gray background or something. So in the below screenshot, if revision 1270 had not been pushed, have that show up