349
edits
Mercurial: Difference between revisions
→Staying up-to-date with the main savannah repository
| Line 98: | Line 98: | ||
<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 http://www.octave.org/hg/octave </code> </li> | <code> hg pull http://www.octave.org/hg/octave </code> </li> | ||
<li><code> hg up -r student-bookmark-name </code> <br/> | <li> Merge the main line of development into the feature branch <br/> | ||
<code> hg up -r student-bookmark-name </code> <br/> | |||
<!--[[File:Hg-student-flow2.png]] <br/>--> | <!--[[File:Hg-student-flow2.png]] <br/>--> | ||
<code> hg merge @ </code> </li> | <code> hg merge @ </code> </li> | ||
<li><code> hg commit -m "periodic merge of default branch into my branch" </code | <li> Apply the change and publish it | ||
<code> hg commit -m "periodic merge of default branch into my branch" </code> | |||
<!--[[File:Hg-student-flow3.png]] <br/>--> | <!--[[File:Hg-student-flow3.png]] <br/>--> | ||
<code> hg push ssh://student@public.server.org/octave </code></li> | |||
</ol> | </ol> | ||