216
edits
Mercurial: Difference between revisions
Jump to navigation
Jump to search
m
→Tips for working with TortoiseHg: Fix some typos and grammar errors.
m (→Tips for working with TortoiseHg: Fix some typos and grammar errors.) |
|||
| (3 intermediate revisions by 2 users not shown) | |||
| Line 27: | Line 27: | ||
first. The maximal line width is 80 characters. | first. The maximal line width is 80 characters. | ||
diff -r f5c9bb5955e7 -r 68c698c4f2fd scripts/help/help.m | |||
--- a/scripts/help/help.m Tue Jun 09 14:11:13 2020 -0700 | --- a/scripts/help/help.m Tue Jun 09 14:11:13 2020 -0700 | ||
+++ b/scripts/help/help.m Wed Jun 10 18:08:11 2020 +0900 | +++ b/scripts/help/help.m Wed Jun 10 18:08:11 2020 +0900 | ||
@@ -99,7 +99,7 @@ function retval = help (name) | @@ -99,7 +99,7 @@ function retval = help (name) | ||
endif | |||
## Get help text | ## Get help text | ||
| Line 38: | Line 38: | ||
## Take action depending on help text format | ## Take action depending on help text format | ||
switch (lower (format)) | |||
</syntaxhighlight>}} | </syntaxhighlight>}} | ||
| Line 150: | Line 150: | ||
[alias] | [alias] | ||
glog = log --graph | glog = log --graph | ||
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" 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" extension does *not* allow to modify pushed changes. | |||
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. | |||
=== 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: | |||
# 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 == | ||