Loading...
 
Overriding the HEAD with BRANCH-1-9 Tiki version »  2.x

RefreshHEAD

Tikiwiki HEAD Refresh Operation

Here was the initial announce on tikiwiki developers mailing-list.
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)


No contestation have been noticed after 5 days, then I plan to proceed to the CVS operations as soon as possible.

Here are the planned steps :

# 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


Contributors to this page: pkdille and Mose .
Page last modified on Saturday 30 August, 2008 07:05:37 UTC by pkdille.

Keywords

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.

Accessibility (WAI & 508)
Accounting 7.x
Administration
Ajax 2.x
Articles & Submissions
Backlinks
Banner
Batch 6.x
BigBlueButton audio/video/chat/screensharing (5.x)
Blog
Bookmark
Browser Compatibility
Calendar
Category
Chat
Comment
Communication Center
Consistency
Contacts Address book
Contact us
Content template
Contribution 2.x
Cookie
Copyright
Credits 6.x
Custom Home (and Group Home Page)
Database MySQL - MyISAM
Database MySQL - InnoDB
Date and Time
Debugger Console
Directory (of hyperlinks)
Documentation link from Tiki to doc.tiki.org (Help System)
Docs 8.x
DogFood
Draw 7.x
Dynamic Content
Preferences
Dynamic Variable
External Authentication
FAQ
Featured links
Feeds (RSS)
File Gallery
Forum
Friendship Network (Community)
Group
Help
History
Hotword
HTML Page
i18n (Multilingual, l10n, Babelfish)
Image Gallery
Import-Export
Install
Integrator
Interoperability
Inter-User Messages
InterTiki
jQuery
Kaltura video management
Karma
Live Support
Logs (system & action)
Lost edit protection
Mail-in
Map
Menu
Meta Tag
Missing features
Visual Mapping 3.x
Mobile Tiki and Voice Tiki
Mods
Modules
MultiTiki
MyTiki
Newsletter
Notepad
OS independence (Non-Linux, Windows/IIS, Mac, BSD)
Organic Groups (Self-managed Teams)
Payment 5.x
Performance Speed / Load / Compression / Cache
Permission
Poll
Profiles
Quiz
Rating
Realname
Report
Revision Approval
Score
Search engine optimization (SEO)
Search
Security
Semantic links 3.x
Share
Shopping Cart 5.x
Shoutbox
Site Identity
Slideshow
Smarty Template
Social Networking
Spam protection (Anti-bot CATPCHA)
Spellcheck
Spreadsheet
Staging and Approval
Stats
Survey
Syntax Highlighter (Codemirror)
Tablesorter
Tags 2.x
Task
Tell a Friend, alert + Social Bookmarking
Terms and Conditions
Theme
TikiTests 2.x
Timesheet
Token Access
Toolbar (Quicktags)
Tours
Trackers
TRIM
User Administration
User Files
User Menu
Watch
WebHelp
Webmail and Groupmail
WebServices 3.x
Wiki 3D
Wiki History, page rename, etc
Wiki plugins extends basic syntax
Wiki syntax text area, parser, etc
Wiki structure (book and table of content)
Workspace and perspectives 4.x
WYSIWTSN 4.x
WYSIWYCA
WYSIWYG 2.x
XMLRPC




Useful Tools