Mercurial: Difference between revisions
Jump to navigation
Jump to search
Line 109: | Line 109: | ||
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 development branch. To this end students should: | for review and possibly inclusion into the main development branch. To this end students should: | ||
<ol | <ol> | ||
<li> prepare a full log of their changes, listing files that have been touched | <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 | and including a summary of the purpose of those changes. If students have been following | ||
Line 115: | Line 115: | ||
<code> hg log --style=changelog --no-merges --user student-name </code><br> | <code> hg log --style=changelog --no-merges --user student-name </code><br> | ||
this message should be edited so that | this message should be edited so that | ||
<ol> | <ol style="list-style-type: lower-roman;"> | ||
<li> each touched file appears only once </li> | <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> | <li> changes that were backed out should not be mentioned (like changeset "H" in the above example) </li> | ||
Line 122: | Line 122: | ||
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]]. | 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]]. | ||
</ol> | </ol> | ||
== Mercurial Tips for SoC mentors == | == Mercurial Tips for SoC mentors == | ||
<code> | <code> |