139
edits
(Elm reset commands) |
(Fix typo) |
||
Line 329: | Line 329: | ||
# Pull the new head of Elm. <syntaxhighlight lang="Bash">hg pull</syntaxhighlight>. | # Pull the new head of Elm. <syntaxhighlight lang="Bash">hg pull</syntaxhighlight>. | ||
# Rebase the floating patches onto the new checkout of Elm, then checkout the new tip. <syntaxhighlight lang="Bash"> | # Rebase the floating patches onto the new checkout of Elm, then checkout the new tip. <syntaxhighlight lang="Bash"> | ||
hg rebase --keep -s ARC_CONFIG_FLOAT | hg rebase --keep -s ARC_CONFIG_FLOAT -d elm && \ | ||
hg co tip && \ | hg co tip && \ | ||
hg bookmark ARC_CONFIG_FLOAT | hg bookmark ARC_CONFIG_FLOAT |
edits