1,847
edits
Mercurial: Difference between revisions
→Mercurial Tips for SoC students
| Line 52: | Line 52: | ||
<ol> | <ol> | ||
<li> Clone the main Octave repository at savannah:<br> | <li> Clone the main Octave repository at savannah:<br> | ||
<code> hg clone | <code> hg clone https://www.octave.org/hg/octave </code> </li> | ||
<li> Create a new bookmark:<br> | <li> Create a new bookmark:<br> | ||
<code> hg bookmark student-bookmark-name </code> </li> | <code> hg bookmark student-bookmark-name </code> </li> | ||
| Line 71: | Line 71: | ||
<!--[[File:Hg-student-flow1.png]] <br/>--> | <!--[[File:Hg-student-flow1.png]] <br/>--> | ||
<li> Download new changes from the main line of development <br/> | <li> Download new changes from the main line of development <br/> | ||
<code> hg pull | <code> hg pull https://www.octave.org/hg/octave </code> </li> | ||
<li> Merge the main line of development into the feature branch <br/> | <li> Merge the main line of development into the feature branch <br/> | ||
<code> hg up -r student-bookmark-name </code> <br/> | <code> hg up -r student-bookmark-name </code> <br/> | ||
| Line 100: | Line 100: | ||
<ol style="list-style-type: lower-roman;"> | <ol style="list-style-type: lower-roman;"> | ||
<li> pull from the main repository<br/> | <li> pull from the main repository<br/> | ||
<code>hg pull | <code>hg pull https://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/> | <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 up -r @</code><br/> | ||