How to visually “hg rebase –continue” in TortoiseHg Workbench after a Pull->Rebase operation

mercurialtortoisehg

I'm using Mercurial and after I pull changesets from a remote repo, I do a rebase (to keep it easy to sync with SVN).

If there are merge conflicts during the rebase, I need to execute hg rebase --continue after I fix them up. This isn't a big deal, but I'd like a "visual" way to do this since I'm hoping to move my teammates to Hg and the command-line is too frictious for everyone to learn.

How can I execute the continue option during a rebase using only the TortoiseHg Workbench (v 2.2) GUI?

Best Answer

In TortoiseHG you can do a whole rebase using GUI so you don't need to run hg rebase manually. Just right click on a revision and select Modify history->Rebase....

If you already started rebase and want to run rebase --continue via GUI, just run TortoiseHG, right click on any revision and select Modify history->Rebase.... TortoiseHG will detect the unfinished rebase and will run rebase --continue automatically.

How do you configure it to ignore files?

Ignore is configured in a normal text file called .hgignore in the root of your repository. Add it just like a normal file with:

hg add .hgignore

There are two syntax options available for file matching, glob and regexp. glob is unix-like filename expansion and regexp is regular expressions. You activate each by adding syntax: glob or syntax: regexp on a line by itself. All lines following that will use that syntax, until the next syntax marker. You can have as many syntax markers as you want. The default syntax is regexp, so if you only use regexp you don't need any syntax marker.

You can add comments with #

Example:

# python temporary files
syntax: glob
*.pyc

#editor autosaves
*~

# temporary data
syntax: regexp
temp

Ignore only applies to unmanaged files (i.e. files that are not already checked in). To ignore files that are under version control, you can use the switches -I and -X.

How to branch with TortoiseHG

As shown in the docs, all you should need to do is just click on the branch: default button near the top of the commit dialog, and change to a new branch name.

Best Answer

Related Solutions

Mercurial for Beginners: The Definitive Practical Guide

How do you configure it to ignore files?

How to branch with TortoiseHG

Related Topic