1,847
edits
Mercurial: Difference between revisions
→Preparing for code reviews
| Line 83: | Line 83: | ||
#* Do not mention backed-out commits. | #* Do not mention backed-out commits. | ||
# Prepare a singe patch (changeset) including all code that should be submitted for review <syntaxhighlight lang="bash"> | # 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 pull https://www.octave.org/hg/octave # Get remote bookmark "@" | ||
hg update -r @ | hg update -r @ # Activate bookmark "@" | ||
hg merge my-gsoc | hg merge my-gsoc # Merge "my-gsoc" into "@" | ||
hg commit | hg commit | ||
hg export -r tip -o mid-term-review.patch | 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]. | </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 == | == Example Mercurial configuration == | ||