RefreshHEAD

Tikiwiki HEAD Refresh Operation

From: mose <mose@tikiwiki.org>
To: dev@tikiwiki.org
Subject: [Tikiwiki-devel] CVS strategy, what after 1.9 ...
Date: Sat, 7 May 2005 14:08:37 +0200

yo

Here are some ideas about what we could do for further development and
next version of tikiwiki.

It's just an arbitrary proposal, that can become real if nobody
contests with legitimate arguments. Anyway everything is of course
a possible subject of discussion and variations.

* 1.10 HEAD is deadend. People that committed there last year don't
remember what was done there, because it has not been used, thus
unmaintained.

* Then I think about overwriting HEAD with current BRANCH-1-9.
It would reset the tiki-1.9to1.10.sql file of course.

* BRANCH-1-9 branch will then only accept bugfixes. No db change
should occur there, to make easy upgrades for further 1.9.x versions.
Visual enhencements and translations are welcome there.

* renewed HEAD can become 1.10 -arcturus- (upon public decision)
http://tikiwiki.org/tiki-poll_results.php?pollId=6
New stuff can be introduced there.

* merges can then continue from BRANCH-1-9 to HEAD. The tikimerge
script just needs to be enhanced to take in account some exceptions
to the merges : refactored libs and language files at least. (any
others).

* other branches can start from HEAD if motivated by a serious
development project and the necessity of isolated arbitrary
activity, with or without merges depending the range of change.


for any question or comment, talk publically.


cheers,
mose

for the TAG (Tikiwiki Admin Group)

# go to irc://irc.freenode.net/#tikiwiki and shout "Freeze!"
mkdir tikimanip && cd tikimanip
export CVSROOT=":ext:mose@cvs.sf.net:/cvsroot/tikiwiki"
cvs rtag BEFORE-REFRESH-1-10 tikiwiki
cvs co -d tiki110 tikiwiki
cvs rtag -r BRANCH-1-9 BEFORE-REFRESH-1-9 tikiwiki
cvs co -d tiki19 -r BEFORE-REFRESH-1-9 tikiwiki
# preparing future merges
cvs rtag -r BRANCH-1-9 -F BRANCH-1-9-HEAD tikiwiki
cd tiki110
cat ~/bin/refresh.sh
#!/bin/sh

HEAD="/home/mose/tikimanip/tiki110"
BRANCH="/home/mose/tikimanip/tiki19"
TAG="BEFORE-REFRESH-1-9"

cd $HEAD
rm -f ref.sh
echo "#!/bin/sh" > ref.sh

for i in `find $BRANCH -name Entries`;do
  DIR=`dirname $i`
  DIR=`dirname $DIR`
  for j in `grep T$TAG $i | cut -d/ -f2`;do
    F=`echo "$DIR/$j" | sed -e "s~$BRANCH/~~"`
    echo "cp -pf $BRANCH/$F $F" >> ref.sh
    DF=`dirname $F`
    if [ ! -d $DF ]; then
      echo "mkdir $DF" >> ref.sh
      echo "cvs add $DF" >> ref.sh
    fi
    if [ ! -f $F ]; then
      echo "cvs add $F" >> ref.sh
    fi
  done
done

for i in `find $HEAD -name Entries`;do
  DIR=`dirname $i`
  DIR=`dirname $DIR`
  for j in `grep '^/' $i | cut -d/ -f2`;do
    F=`echo "$DIR/$j" | sed -e "s~$HEAD/~~"`
    if [ ! -f $BRANCH/$F ]; then
      echo "cvs remove -f $F" >> ref.sh
    fi
  done
done

echo "Done."
exit 0

# run refresh.sh script, that will generate a ref.sh script in tiki110
~/bin/refresh.sh 
# edit the file and comment some lines that are not relevant (published on http://tikiwiki.org/RefreshHEAD.txt)
vi ref.sh
# run ref.sh, that will copy files and issue cvs add and remove commands
./ref.sh
cvs ci -m'Head Refresh Operation'
# break syncmail
# shout on irc "HEAD refresh operation done. Please test and report on http://dev.tikiwiki.org"
# have a beer