Mercurial: Difference between revisions
Jump to navigation
Jump to search
Line 77: | Line 77: | ||
=== Preparing for code reviews === | === 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 | 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. | ||
for review and possibly inclusion into the main | |||
# 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 | |||
hg update -r @ | |||
hg merge my-gsoc | |||
hg commit | |||
hg export tip > 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]. | |||
== Example Mercurial configuration == | == Example Mercurial configuration == |