349
edits
Mercurial: Difference between revisions
→Staying up-to-date with the main savannah repository
| Line 102: | Line 102: | ||
<!--[[File:Hg-student-flow2.png]] <br/>--> | <!--[[File:Hg-student-flow2.png]] <br/>--> | ||
<code> hg merge @ </code> </li> | <code> hg merge @ </code> </li> | ||
<li> Apply the change and publish it | <li> Apply the change and publish it <br/> | ||
<code> hg commit -m "periodic merge of default branch into my branch" </code> | <code> hg commit -m "periodic merge of default branch into my branch" </code> <br/> | ||
<!--[[File:Hg-student-flow3.png]] <br/>--> | <!--[[File:Hg-student-flow3.png]] <br/>--> | ||
<code> hg push ssh://student@public.server.org/octave </code></li> | <code> hg push ssh://student@public.server.org/octave </code></li> | ||