1,860
edits
Mercurial: Difference between revisions
→Staying up-to-date with the main repository
| Line 68: | Line 68: | ||
<syntaxhighlight lang="bash"> | <syntaxhighlight lang="bash"> | ||
hg pull https://www.octave.org/hg/octave # | hg pull https://www.octave.org/hg/octave # Get remote changes (bookmark "@") | ||
hg update -r my-gsoc # Activate bookmark | hg update -r my-gsoc # Activate bookmark "my-gsoc" | ||
hg merge @ # Merge | hg merge @ # Merge "@" into "my-gsoc" | ||
hg commit -m "maint: merge default to my-gsoc" | hg commit -m "maint: merge default to my-gsoc" | ||
hg push ssh://student@public.server.org/octave | hg push ssh://student@public.server.org/octave | ||