214
edits
Mercurial: Difference between revisions
Jump to navigation
Jump to search
Add some tips for working with TortoiseHg
m (Remove edit test.) |
(Add some tips for working with TortoiseHg) |
||
| Line 152: | Line 152: | ||
top = log --graph -l | top = log --graph -l | ||
</syntaxhighlight>}} | </syntaxhighlight>}} | ||
== Tips for working with TortoiseHg == | |||
TortoiseHg is a multi-platform graphical user interface for Mercurial repositories. It allows to perform many hg operations using the context menu and toolbar buttons. That might make it easier to get used to working with Mercurial. | |||
=== Activate the "mq" extension === | |||
The "mq" extensions allow to modify (local) changeset after they have been committed. They also allow to rebase changes to a new parent or to strip changes completely. | |||
The "mq" extensions do *not* allow to modify pushed changes. | |||
To activate the "mq" extensions in TortoiseSVN, open the settings, select "Extensions" on the global settings tab and activate the checkbox next to "mq". | |||
=== Rebase a change to a current tip === | |||
Sometime a change of the upstream repository might make it necessary to rebase a changeset to a new parent. There are several ways to achieve this. The ways described here might not be the most elegant ones. Any editor is welcome to add onto this. | |||
Strip and commit: | |||
# Pull changes from the upstream repository. | |||
# Before updating to the new tip, strip the local changes by selecting "Modify History" -> "Strip..." from the right click menu. In the dialog select, "Do not modify working copy during strip (-k/--keep)". | |||
# Update to the new tip (maybe in incremental steps). | |||
# Commit the local changes in a "fresh" changeset. This has the drawback that any commit message might be lost. But it often works even if other approaches fail. | |||
Un-apply and re-apply: | |||
# Pull changes from the upstream repository. | |||
# Before updating to the new tip, import the local changeset to mq by selecting "Modify History" -> "Import to MQ" in the right click menu. | |||
# You might want to refresh the changeset with local changes. | |||
# Un-apply the patch by selecting "Modify History" -> "Unapply Patch" from the right click menu. If there are other, un-committed changes in the local repository, you might want to select "Tolerate non-conflicting local changes (--keep-changes)" in the "Modify History" -> "MQ Options" dialog from the right click menu beforehand. | |||
# Update to the new tip. | |||
# Select the previously unapplied patch on top of the revision graph and re-apply it by using the "Reapply Patch" option in the right click menu. This has the advantage that a commit message will be retained. But re-applying the patch might fail if there were changes in the upstream repository that made the patch incompatible. | |||
Rebase: | |||
# Pull changes from the upstream repository. | |||
# Select the local changeset that you'd like to rebase. | |||
# Hold down the Ctrl key and select the changeset that should be the new parent of the local changeset (probably the new tip). | |||
# Right-click the changeset of the new parent and select "Rebase...". | |||
# The default settings are often times fine. This process has the advantage that a commit message will be retained and it often times resolves conflicts automatically. But it doesn't work if there are any un-committed local changes. | |||
== Footnotes == | == Footnotes == | ||