Editing Mercurial
Jump to navigation
Jump to search
The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then publish the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 2: | Line 2: | ||
Everybody is free to '''run, copy, distribute, study, change and improve'''<ref>https://www.gnu.org/philosophy/free-sw.en.html</ref> Octave's source code, given in the main repository at https://www.octave.org/hg/octave. Use Mercurial to get the latest version of Octave <pre>hg clone https://www.octave.org/hg/octave</pre> | Everybody is free to '''run, copy, distribute, study, change and improve'''<ref>https://www.gnu.org/philosophy/free-sw.en.html</ref> Octave's source code, given in the main repository at https://www.octave.org/hg/octave. Use Mercurial to get the latest version of Octave <pre>hg clone https://www.octave.org/hg/octave</pre> | ||
{{Note|[https://tortoisehg.bitbucket.io/ TortoiseHg] is a GUI for Mercurial and it is especially recommended for users doing their first steps with source code management systems. Linux, macOS, and MS Windows are supported.}} | {{Note|[https://tortoisehg.bitbucket.io/ TortoiseHg] is a GUI for Mercurial and it is especially recommended for users doing their first steps with source code management systems. Linux, macOS, and MS Windows are supported.}} | ||
Line 185: | Line 159: | ||
=== Activate the "mq" extension === | === Activate the "mq" extension === | ||
The "mq" | 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" | 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 === | === 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: | 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, | # 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. |