254
edits
Mercurial: Difference between revisions
Jump to navigation
Jump to search
m
→Tips for working with TortoiseHg: Fix some typos and grammar errors.
(→Activate the "mq" extension: Add notes about updating an existing patch) |
m (→Tips for working with TortoiseHg: Fix some typos and grammar errors.) |
||
| Line 159: | Line 159: | ||
=== Activate the "mq" extension === | === Activate the "mq" extension === | ||
The "mq" | The "mq" extension allows to modify (local) changesets after they have been committed. It also allows to rebase changes to a new parent or to strip changes completely. | ||
The "mq" | The "mq" extension does *not* allow to modify pushed changes. | ||
To activate the "mq" | To activate the "mq" extension in TortoiseSVN, open the settings, select "Extensions" on the global settings tab and activate the checkbox next to "mq". | ||
The most useful feature of that extension is probably to update an existing changeset. For this, select "Modify History" -> "Import to MQ" in the right click menu of the respective changeset. After updating some local files or changing the commit message, hit the "QRefresh" button. Finish the patch by selecting "Modify History" -> "Finish Patch" from the right click menu of the respective changeset. | The most useful feature of that extension is probably to update an existing changeset. For this, select "Modify History" -> "Import to MQ" in the right click menu of the respective changeset. After updating some local files or changing the commit message, hit the "QRefresh" button. Finish the patch by selecting "Modify History" -> "Finish Patch" from the right click menu of the respective changeset. | ||
| Line 168: | Line 168: | ||
=== Rebase a change to a current tip === | === Rebase a change to a current tip === | ||
Sometimes a change in 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: | Strip and commit: | ||
# Pull changes from the upstream repository. | # 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 | # 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). | # 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. | # 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. | ||