[Soc-2005-dev] Future merging from bf-blender

[Chris Want]

Hey Jiri, Eman, et al,

Below is a step-by-step walk through of how I
would update the BLENDER_DIST branch.
I have also included a review of how to
merge an individual's branch below that.
Of course, only one person should update the
main branch on any given day, but each individual
can update their own branch after that.

###### IMPORTING BLENDER SOURCES ######

# note: your name isn't 'hos', and the date has probably changed.
# so modify the following stuff. If your not working with bash you
# can replace the ${} variables by hand.

export SOC_CVS_USER=hos
export SOC_DATE=2005_10_20
export SOC_DATE_SLASHES=2005/10/20
#trick: export SOC_DATE_SLASHES=`echo ${SOC_DATE} | sed 's:_:/:g'`

# get blender tree -- probably best not to do this with a
# working directory
cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender login
cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender \
     export -kk -D now blender

# this is REALLY important (failing to do this is disasterous):
cd blender

# import blender sources into BLENDER_DIST branch
cvs -d :ext:${SOC_CVS_USER}@cvs.blender.org:/cvsroot/soc-2005 import \
   -m "Merge of Blender/cvs ${SOC_DATE_SLASHES}" soc-blender \
   BLENDER_DIST BLENDER_CVS_${SOC_DATE}

# The above command will give instructions for fixing conflicts
# for HEAD, but add a -kk flag after 'checkout' to make your
# life much easier -- then commit your fixes (this should be
# very easy and automated).

###### MERGING YOUR OWN BRANCH ######

# First of all, figure out the last time you merged your tree, and
# of course you must know your branch name. If you have a lot of weird
# conflicts, set the date below to one day after your last merge

export SOC_BRANCH_NAME=hos
export SOC_CVS_USER=hos
# Note: with dashes this time
export SOC_LAST_MERGE=2005-09-20

# go to a (clean) working copy of your branch, or check out a
# new one:

cvs -d :ext:${SOC_CVS_USER}@cvs.blender.org:/cvsroot/soc-2005 co \
   -r ${SOC_BRANCH_NAME} soc-blender

cd soc-blender

# Merge like this:

cvs up -kk -j BLENDER_DIST:${SOC_LAST_MERGE} -j BLENDER_DIST

# fix conflicts and commit