Mercurial: Difference between revisions

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"

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.