Mercurial: Difference between revisions

Jump to navigation Jump to search

Mercurial (edit)

Revision as of 03:26, 11 June 2020

296 bytes removed ,  11 June 2020
→‎Staying up-to-date with the main repository
Line 61: Line 61:
=== Staying up-to-date with the main repository ===
=== Staying up-to-date with the main repository ===


As the students development proceeds,
Octave development does not stand still while the students development proceeds.  Octave's main repository gets updated, too. The following commands can be used to get these updated to the students clone of the main repository:
the savannah repository gets updated, too.  
 
To avoid having the two branches diverging too much, which can
<syntaxhighlight lang="bash">
lead to conflicts when the final merge is done, students should
hg pull https://www.octave.org/hg/octave       # Get latest changes from main repo, bookmark "@"
keep their public repo up-to-date with the recent changes,
hg update -r my-gsoc                          # Select my bookmark
the following commands can be used for this:<br/>
hg merge @                                     # Merge changes of bookmark "@" to bookmark "my-gsoc"
<ol>
hg commit -m "maint: merge default to my-gsoc"
<!--[[File:Hg-student-flow1.png]] <br/>-->
hg push ssh://student@public.server.org/octave
<li> Download new changes from the main line of development <br/>
</syntaxhighlight>
<code> hg pull https://www.octave.org/hg/octave </code> </li>
<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/>-->
<code> hg merge @ </code> </li>
<li> Apply the change and publish it <br/>
<code> hg commit -m "periodic merge of default branch into my branch" </code> <br/>
<!--[[File:Hg-student-flow3.png]] <br/>-->
<code> hg push ssh://student@public.server.org/octave </code></li>
</ol>


=== Preparing for code reviews ===
=== Preparing for code reviews ===
Retrieved from "https://wiki.octave.org/Special:MobileDiff/13160"

Navigation menu