Difference between revisions of "Mercurial"

From Octave
Jump to navigation Jump to search
m (→‎Tips for working with TortoiseHg: Fix some typos and grammar errors.)
 
(68 intermediate revisions by 8 users not shown)
Line 1: Line 1:
[[wikipedia:Mercurial]] (sometimes referred to as {{codeline|hg}}) is the version control tool used by Octave.
+
[https://www.mercurial-scm.org Mercurial] (sometimes referred to as {{codeline|hg}}) is the source code management system used for Octave development.
This page contains some helpful commands to use when interacting with the GNU Octave mercurial repository.
 
  
== Patches ==
+
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>
When you do not have push permissions to the repository (you cannot add your changes using mercurial itself) and you have a modification to the current GNU Octave code, you have to generate a patch (or changeset) so developers with permissions can include them in the code. The overview of the process is as follows
 
# Change the code and test that your changes do work (write tests, that's the best!).
 
# Create the changeset (instructions below).  
 
# Post your patch in the [https://savannah.gnu.org/patch/?group=octave Patch tracker].
 
  
=== Before starting ===
+
{{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.}}
The way patches are generated uses an [http://mercurial.selenic.com/wiki/MqExtension extension] of mercurial and therefore you need to prepare your .hgrc file to use it.
 
If you do not have a .hgrc file, just create one in your home directory. In Windows, this is something like "C:\Documents and Settings\your_name\Mercurial.ini"
 
  
Add the following code to that file:
+
== Creating and submitting patches (changesets) ==
  [ui]
+
 
  username = Your Real Name <some@email.com>
+
If you want to share your modifications, for example to fix a nasty '''bug #42424''', you cannot just submit your changes to Octave's main repository.  You have to generate a '''patch (or changeset)''' so other Octave developers can include them into Octave's source code.
 +
 
 +
# Get the latest version of Octave (or some Octave package) <pre>hg clone https://www.octave.org/hg/octave</pre> or when already cloned <pre>hg pull && hg update</pre>
 +
# Make your changes (fix bug #42424) and save them.  '''Make sure that your changes don't introduce new bugs!'''  Thus it is recommended to [[Building | build Octave]] and to [[Tests | run Octave's test suite]] before proceeding.<br>{{Warning|Please follow the [[Contribution guidelines]] for C/C++ or Octave code files!}}
 +
# Commit your changes <pre>hg commit</pre> Mercurial will open your default editor<ref>To set your default Mercurial editor, read https://www.mercurial-scm.org/wiki/editor .</ref> and ask you for a commit message. Please follow the [[commit message guidelines]], e.g. <syntaxhighlight lang="text">help.m: Display relevant topics first (bug #42424)
 +
 
 +
* scripts/help/help.m: Describe what you changed to display relevant topics
 +
  first. The maximal line width is 80 characters.</syntaxhighlight>
 +
# Export the changes <pre>hg export -r tip -o bug42424.patch</pre> The final patch for submission will look like this {{file|bug42424.patch|<syntaxhighlight lang="diff"># HG changeset patch
 +
# User Awesome Hacker <awesome@hacker.com>
 +
# Date 1591780091 -32400
 +
#      Wed Jun 10 18:08:11 2020 +0100
 +
# Node ID 68c698c4f2fd98bf2d48234bd1da99e91763114f
 +
# Parent  f5c9bb5955e7c9fddef5c3c3f115201e11b43b79
 +
 
 +
help.m: Display relevant topics first (bug #42424)
 +
 
 +
* scripts/help/help.m: Describe what you changed to display relevant topics
 +
  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
 +
+++ b/scripts/help/help.m Wed Jun 10 18:08:11 2020 +0900
 +
@@ -99,7 +99,7 @@ function retval = help (name)
 +
    endif
 
   
 
   
[extensions]
+
    ## Get help text
hgext.mq =
+
-    [text, format] = get_help_text (name);
hgext.pager =
+
+    [text, format] = get_better_help_text (name);
color =
 
 
   
 
   
[pager]
+
    ## Take action depending on help text format
pager = LESS='FSRX' less
+
    switch (lower (format))
attend = help, annotate, cat, diff, export, glog, log, qdiff, status, outgoing, incoming
+
 
+
</syntaxhighlight>}}
## Colours I like
+
# Upload {{Path|bug42424.patch}} to the [https://savannah.gnu.org/bugs/?group=octave bug] or [https://savannah.gnu.org/patch/?group=octave patch] tracker. If your patch file is larger than the upload limit, you can compress it before uploading. Please use a free format!
  [color]
+
 
status.modified = magenta bold
+
== Mercurial Tips for SoC students ==
  status.added = green bold
+
 
  status.removed = red bold
+
This section is meant to provide tips for [[Summer of Code]] students working on new Octave features.
  status.deleted = cyan bold
+
 
  status.unknown = gray  bold
+
Students should publish their work as it progresses in a public repository. In this section we use for example <code>public.server.org/octave</code>.
status.ignored = gray bold
+
 
 +
=== Using bookmarks ===
 +
 
 +
[https://www.mercurial-scm.org/wiki/Bookmarks Bookmarks] are useful for identifying a series of commits. They are a "lightweight" solution to [https://www.mercurial-scm.org/wiki/NamedBranches named branches], which are not automatically updated for example.  To create a bookmark <code>my-gsoc</code> use
 +
 
 +
<syntaxhighlight lang="bash">
 +
hg clone https://www.octave.org/hg/octave
 +
hg bookmark my-gsoc
 +
</syntaxhighlight>
 +
 
 +
To make the bookmark visible in the public repository use
 +
 
 +
<syntaxhighlight lang="bash">
 +
hg push --bookmark ssh://student@public.server.org/octave
 +
</syntaxhighlight>
 +
 
 +
=== Staying up-to-date with the main repository ===
 +
 
 +
Octave development does not stand still while the students development proceeds. Octave's main repository gets updated, too. The following commands can be used to get these updated to the students clone of the main repository:
 +
 
 +
<syntaxhighlight lang="bash">
 +
hg pull https://www.octave.org/hg/octave  # Get latest remote "tip"
 +
hg update -r my-gsoc                      # Activate bookmark "my-gsoc"
 +
hg merge tip                              # Merge "tip" into "my-gsoc"
 +
hg commit -m "maint: merge default to my-gsoc"
 +
hg push ssh://student@public.server.org/octave
 +
</syntaxhighlight>
 +
 
 +
=== Preparing for code reviews ===
 +
 
 +
At the time of the mid-term or final review (or whenever the mentor requires it) students should prepare their code for review and possibly inclusion into the main repository.
 +
 
 +
# Create a full log of changes <pre>hg log --template=changelog --no-merges --user student-name</pre> If students have been following the [[Commit message guidelines]] the output is a good starting point for the commit message in the next step. Some manual post-processing might be necessary:
 +
#* Each touched file should appear only once.
 +
#* Do not mention backed-out commits.
 +
# Prepare a singe patch (changeset) including all code that should be submitted for review <syntaxhighlight lang="bash">
 +
hg pull https://www.octave.org/hg/octave  # Get remote "tip" and "@"
 +
hg update -r @                            # Activate    bookmark "@"
 +
hg merge my-gsoc                          # Merge "my-gsoc" into "@"
 +
hg commit
 +
hg export -r tip -o mid-term-review.patch
 +
</syntaxhighlight> The file {{Path|mid-term-review.patch}} can uploaded to the [https://savannah.gnu.org/patch/?group=octave patch tracker]. <br/> Finally, there is a subtle difference between <code>"tip"</code>, which is a reference to the (local or remote) changeset added to the repository most recently and the bookmark <code>"@"</code> used by the Octave developers to point to the latest remote changeset. Often both refer to the very same changeset and they can used interchangeably.
 +
 
 +
== Example Mercurial configuration ==
 +
 
 +
Place the following file in your home directory, e.g. {{Path|/home/username/.hgrc}}.
 +
 
 +
{{File|.hgrc|<syntaxhighlight lang="ini">
 +
[ui]
 +
username = Your Name <your@email>
 +
 
 +
[extensions]
 +
color =
 +
histedit =
 +
pager =
 +
rebase =
 +
strip =
  
The only part that is important is the extensions. The rest is to make hg behave in a fancy way (recommended).
+
[pager]
 +
pager = LESS='FSRX' less
 +
attend = help, annotate, cat, diff, export, glog, log, outgoing, incoming
  
=== Creating changesets with hg ===
+
[diff]
==== Simple way ====
+
showfunc = True
* Update to the latest revision.
 
<pre> hg up </pre>
 
* Make your changes and save.
 
* Commit your code following the [[commit message guidelines]].
 
<pre> hg ci </pre>
 
* Export the modifications.
 
<pre> hg export -r tip -o mypatch.patch </pre>
 
* Save the output to a file and upload it to the patch tracker.
 
  
==== Using the MQ extension ====
+
[color]
In the repository you can start a patch by doing
+
mode = terminfo
hg qnew mychangeset
 
  
You can further edit your files... if you do, you need your patch to know about these changes. To do that execute
+
## Custom colors
hg qrefresh
+
color.gray = 244
 +
color.orange = 202
 +
color.lightyellow = 191
 +
color.darkorange = 220
 +
color.brightyellow = 226
  
Once you think you have all the changes that make your patch complete you can export your patch
+
status.modified = magenta bold
hg qdiff > mychangeset.patch
+
status.added = green bold
 +
status.removed = red bold
 +
status.deleted = cyan bold
 +
status.unknown = gray bold
 +
status.ignored = gray bold
  
Now you can do (at least) two things
+
## Colors for each label
* Apply your patch to your copy (it will differ form the repository and you will have to merge somehow...). To do it run
+
log.branch = cyan
hg qfinish tip
+
log.summary = lightyellow
* Forget the changes and go back to the unpatched version of the code.
+
log.description = lightyellow
hg qrefresh
+
log.bookmark = green
hg qpop
+
log.tag = darkorange
hg qfinish tip
+
log.graph = blue
  
The file mychangeset.patch contains your changes.
+
## Colors for each phase
 +
changeset.secret = blue bold
 +
changeset.draft  = red bold
 +
changeset.public = orange
  
 +
desc.here = bold blue_background
  
== Mercurial Tips for SoC students ==
+
[bookmarks]
 +
track.current = True
  
This section is meant to provide tips for SOCIS or GSoC students working on new Octave features.
+
[alias]
 +
glog = log --graph
 +
top  = log --graph -l
 +
</syntaxhighlight>}}
  
Students should publish their work as it progresses in a public repository
+
== Tips for working with TortoiseHg ==
merging regularly the main savannah repository to facilitate merging back their
 
code at the end of the project.
 
  
Here are some useful hg commands that can be used to do this.
+
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.
  
=== Getting started ===
+
=== Activate the "mq" extension ===
<!--[[File:Hg-student-start.png]]-->
 
<ol>
 
<li> Clone the main Octave repository at savannah:<br>
 
<code> hg clone http://www.octave.org/hg/octave </code> </li>
 
<li> Create a new bookmark:<br>
 
<code> hg bookmark student-bookmark-name </code> </li>
 
<li> Make the bookmark visible in the public repo, assuming the public repo is at <code>public.server.org/octave</code><br>
 
<code> hg push --bookmark ssh://student@public.server.org/octave </code> </li>
 
</ol>
 
  
=== Staying up-to-date with the main savannah repository ===
+
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.
  
<!-- After working for a while, the public repo should look like the following picture. -->
+
To activate the "mq" extension in TortoiseSVN, open the settings, select "Extensions" on the global settings tab and activate the checkbox next to "mq".
As the students development proceeds,
 
the savannah repository gets updated, too.
 
To avoid having the two branches diverging too much, which can
 
lead to conflicts when the final merge is done, students should
 
keep their public repo up-to-date with the recent changes,
 
the following commands can be used for this:<br/>
 
<ol>
 
<!--[[File:Hg-student-flow1.png]] <br/>-->
 
<li> Download new changes from the main line of development <br/>
 
<code> hg pull http://www.octave.org/hg/octave </code> </li>
 
<li> Merge the main line of development into the feature branch <br/>
 
<code> hg up -r student-bookmark-name </code> <br/>
 
<!--[[File:Hg-student-flow2.png]] <br/>-->
 
<code> hg merge @ </code> </li>
 
<li> Apply the change and publish it <br/>
 
<code> hg commit -m "periodic merge of default branch into my branch" </code> <br/>
 
<!--[[File:Hg-student-flow3.png]] <br/>-->
 
<code> hg push ssh://student@public.server.org/octave </code></li>
 
</ol>
 
  
=== Preparing for code reviews ===
+
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.
At the time of the mid-term or final review (or whenever the mentor requires it) students should prepare their code
 
for review and possibly inclusion into the main development branch. To this end students should:
 
<ol>
 
<li> prepare a full log of their changes, listing files that have been touched
 
and including a summary of the purpose of those changes. If students have been following
 
the [[Commit message guidelines]] the following command will give a good starting point<br>
 
<code> hg log --style=changelog --no-merges --user student-name </code><br>
 
this message should be edited so that
 
<ol  style="list-style-type: lower-roman;">
 
<li> each touched file appears only once </li>
 
<li> changes that were backed out should not be mentioned <!--(like changeset "H" in the above example)--> </li>
 
</ol>
 
The main  purpose of this log is to make it easy, not only for the main mentor, but also for other developers who
 
have not been closely following the progress of the project to quickly understand where to look at in the code to evaluate it, but it will also be used as the commit message for the merge changeset, so it should itself comply with the [[Commit message guidelines]].
 
<li> prepare a merge changeset including all the code that should be submitted for review
 
  <ol style="list-style-type: lower-roman;">
 
  <li> pull from the main repository<br/>
 
  <code>hg pull http://www.octave.org/hg/octave</code></li>
 
  <li> move to the top of the main line of development and merge in the feature branch<br/>
 
  <code>hg up -r @</code><br/>
 
  <code>hg merge student-bookmark-name </code><br/></li>
 
  <li> create a changeset, export it and send to the mentor for review, remember to use the log created above as a commit message<br/>
 
  <code>hg commit </code><br/>
 
  <code>hg export @ > mid-term-review.changeset </code><br/>
 
  the file mid-term-review.changeset can then be sent to the [[mailto:octave-maintainers@octave.org  mailing list]] or posted
 
  to the [[http://savannah.gnu.org/patch/?group=octave  patch tracker]]</li>
 
  </ol> </li>
 
</ol>
 
  
== Mercurial Tips for SoC mentors ==
+
=== Rebase a change to a current tip ===
  
Will fill in this section after trying out the above procedure at least once with a student
+
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.
and actually pushing his changes to the main repo.
 
  
<!---
+
Strip and commit:
<code>
+
# Pull changes from the upstream repository.
hg pull http://student.repo.url
+
# 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)".
</code>
+
# 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.
  
<code>
+
Un-apply and re-apply:
hg pull http://www.octave.org/hg/octave
+
# Pull changes from the upstream repository.
</code>
+
# 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.
  
<code>
+
Rebase:
hg up -r @
+
# Pull changes from the upstream repository.
</code>
+
# 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.
  
<code>
+
== Footnotes ==
hg merge student_bookmark
 
</code>
 
  
<code>
+
<references/>
hg log --style=changelog --user student
 
</code>
 
-->
 
  
==External links==
+
== External links ==
  
* [http://mercurial.selenic.com/ Official website]
+
* https://hginit.com/ -- Mercurial tutorial
 +
* https://www.mercurial-scm.org/wiki/Tutorial -- Mercurial tutorial
 +
* https://www.mercurial-scm.org/wiki/QuickStart -- Mercurial quick start
 +
* https://tortoisehg.bitbucket.io/ -- TortoiseHg is a GUI for Mercurial (Linux, macOS, MS Windows)
  
 
[[Category:Development]]
 
[[Category:Development]]

Latest revision as of 00:22, 24 February 2021

Mercurial (sometimes referred to as hg) is the source code management system used for Octave development.

Everybody is free to run, copy, distribute, study, change and improve[1] 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

hg clone https://www.octave.org/hg/octave
Info icon.svg
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.

Creating and submitting patches (changesets)[edit]

If you want to share your modifications, for example to fix a nasty bug #42424, you cannot just submit your changes to Octave's main repository. You have to generate a patch (or changeset) so other Octave developers can include them into Octave's source code.

  1. Get the latest version of Octave (or some Octave package)
    hg clone https://www.octave.org/hg/octave
    or when already cloned
    hg pull && hg update
  2. Make your changes (fix bug #42424) and save them. Make sure that your changes don't introduce new bugs! Thus it is recommended to build Octave and to run Octave's test suite before proceeding.
    Warning icon.svg
    Please follow the Contribution guidelines for C/C++ or Octave code files!
  3. Commit your changes
    hg commit
    Mercurial will open your default editor[2] and ask you for a commit message. Please follow the commit message guidelines, e.g.
    help.m: Display relevant topics first (bug #42424)
    
    * scripts/help/help.m: Describe what you changed to display relevant topics
      first.  The maximal line width is 80 characters.
    
  4. Export the changes
    hg export -r tip -o bug42424.patch
    The final patch for submission will look like this
    File: bug42424.patch
    # HG changeset patch
    # User Awesome Hacker <awesome@hacker.com>
    # Date 1591780091 -32400
    #      Wed Jun 10 18:08:11 2020 +0100
    # Node ID 68c698c4f2fd98bf2d48234bd1da99e91763114f
    # Parent  f5c9bb5955e7c9fddef5c3c3f115201e11b43b79
    
    help.m: Display relevant topics first (bug #42424)
    
    * scripts/help/help.m: Describe what you changed to display relevant topics
      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
    +++ b/scripts/help/help.m	Wed Jun 10 18:08:11 2020 +0900
    @@ -99,7 +99,7 @@ function retval = help (name)
         endif
     
         ## Get help text
    -    [text, format] = get_help_text (name);
    +    [text, format] = get_better_help_text (name);
     
         ## Take action depending on help text format
         switch (lower (format))
    
  5. Upload bug42424.patch to the bug or patch tracker. If your patch file is larger than the upload limit, you can compress it before uploading. Please use a free format!

Mercurial Tips for SoC students[edit]

This section is meant to provide tips for Summer of Code students working on new Octave features.

Students should publish their work as it progresses in a public repository. In this section we use for example public.server.org/octave.

Using bookmarks[edit]

Bookmarks are useful for identifying a series of commits. They are a "lightweight" solution to named branches, which are not automatically updated for example. To create a bookmark my-gsoc use

hg clone https://www.octave.org/hg/octave
hg bookmark my-gsoc

To make the bookmark visible in the public repository use

hg push --bookmark ssh://student@public.server.org/octave

Staying up-to-date with the main repository[edit]

Octave development does not stand still while the students development proceeds. Octave's main repository gets updated, too. The following commands can be used to get these updated to the students clone of the main repository:

hg pull https://www.octave.org/hg/octave   # Get latest remote "tip"
hg update -r my-gsoc                       # Activate bookmark "my-gsoc"
hg merge tip                               # Merge  "tip" into "my-gsoc"
hg commit -m "maint: merge default to my-gsoc"
hg push ssh://student@public.server.org/octave

Preparing for code reviews[edit]

At the time of the mid-term or final review (or whenever the mentor requires it) students should prepare their code for review and possibly inclusion into the main repository.

  1. Create a full log of changes
    hg log --template=changelog --no-merges --user student-name
    If students have been following the Commit message guidelines the output is a good starting point for the commit message in the next step. Some manual post-processing might be necessary:
    • Each touched file should appear only once.
    • Do not mention backed-out commits.
  2. Prepare a singe patch (changeset) including all code that should be submitted for review
    hg pull https://www.octave.org/hg/octave   # Get remote "tip" and "@"
    hg update -r @                             # Activate    bookmark "@"
    hg merge my-gsoc                           # Merge "my-gsoc" into "@"
    hg commit
    hg export -r tip -o mid-term-review.patch
    
    The file mid-term-review.patch can uploaded to the patch tracker.
    Finally, there is a subtle difference between "tip", which is a reference to the (local or remote) changeset added to the repository most recently and the bookmark "@" used by the Octave developers to point to the latest remote changeset. Often both refer to the very same changeset and they can used interchangeably.

Example Mercurial configuration[edit]

Place the following file in your home directory, e.g. /home/username/.hgrc.

File: .hgrc
[ui]
username = Your Name <your@email>

[extensions]
color =
histedit =
pager =
rebase =
strip =

[pager]
pager = LESS='FSRX' less
attend = help, annotate, cat, diff, export, glog, log, outgoing, incoming

[diff]
showfunc = True

[color]
mode = terminfo

## Custom colors
color.gray = 244
color.orange = 202
color.lightyellow = 191
color.darkorange = 220
color.brightyellow = 226

status.modified = magenta bold
status.added = green bold
status.removed = red bold
status.deleted = cyan bold
status.unknown = gray bold
status.ignored = gray bold

## Colors for each label
log.branch = cyan
log.summary = lightyellow
log.description = lightyellow
log.bookmark = green
log.tag = darkorange
log.graph = blue

## Colors for each phase
changeset.secret = blue bold
changeset.draft  = red bold
changeset.public = orange

desc.here = bold blue_background

[bookmarks]
track.current = True

[alias]
glog = log --graph
top  = log --graph -l

Tips for working with TortoiseHg[edit]

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[edit]

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[edit]

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:

  1. Pull changes from the upstream repository.
  2. 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)".
  3. Update to the new tip (maybe in incremental steps).
  4. 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:

  1. Pull changes from the upstream repository.
  2. Before updating to the new tip, import the local changeset to mq by selecting "Modify History" -> "Import to MQ" in the right click menu.
  3. You might want to refresh the changeset with local changes.
  4. 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.
  5. Update to the new tip.
  6. 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:

  1. Pull changes from the upstream repository.
  2. Select the local changeset that you'd like to rebase.
  3. Hold down the Ctrl key and select the changeset that should be the new parent of the local changeset (probably the new tip).
  4. Right-click the changeset of the new parent and select "Rebase...".
  5. 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[edit]

External links[edit]