From c08d18981cb55de80b23093f3a228ab0cce595ec Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 8 Jul 2004 07:42:49 +0000 Subject: [PATCH] Minor updates --- lang/en/docs/cvs.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lang/en/docs/cvs.html b/lang/en/docs/cvs.html index 124a1027b0..2638126858 100644 --- a/lang/en/docs/cvs.html +++ b/lang/en/docs/cvs.html @@ -173,9 +173,11 @@ update -dP
  • Merge everything on the branch since the last merge, into your trunk version

    cvs update -kk -j MOODLE_13_MERGED -j MOODLE_13_STABLE
    • -
  • Check the merged copy back into CVS trunk version

    +
  • Carefully watch the update logs for conflicts, and fix every file that you see with a conflict
    • +
  • Check the merged copy back into CVS trunk version
    +
    cvs commit
    -
    • +
  • Go back to the branch version

    cvs update -dPr MOODLE_13_STABLE
    • @@ -206,8 +208,9 @@ update -dP
  • Work in that branch until the feature is reasonably stable. Commit as necessary.

    cvs commit
    • -
  • When ready, merge the whole branch into the trunk, commit it to the trunk and then abandon the branch. -

    +
  • When ready, merge the whole branch into the trunk, fix conflicts, commit it to the trunk and then abandon the branch. +
    +
    cvs update -dPA
    cvs update -kk -j MOODLE_XX_WIDGET
    -- 2.39.5