Writing /home/k4ml/webapps/drupal5/wiki/data/cache/9/971f534decd832080629a58a79c3c6b6.i failed
Writing /home/k4ml/webapps/drupal5/wiki/data/cache/9/971f534decd832080629a58a79c3c6b6.i failed
Writing /home/k4ml/webapps/drupal5/wiki/data/cache/9/971f534decd832080629a58a79c3c6b6.xhtml failed

Branching and Merging

I’m gonna split my work into two seperate branch, the current one dev and a new one rel which is the one that will be used in production.

$ tla archive-setup gemilang--rel--1.0
$ tla tag gemilang--dev--1.0--patch-7 gemilang--rel--1.0

First I create a new revision rel in gemilang category, then tag latest patch level from gemilang–dev–1.0, which is patch-7 to gemilang–rel–1.0. Now I can use tla get to checkout from the new branch gemilang–rel–1.0.

$ tla get gemilang--rel--1.0 gemilang--rel

This will pull out base-0 (–> patch-7 of gemilang–dev–1.0). This is the one that I’m gonna put on the production site. It’s normal for us to discover small bugs on the released version, so I just fix the bugs in this branch and commit it, which would create the patch-1 for gemilang–rel–1.0. To backport this fix to the rel branch, I use tla replay command, which handy to apply specifix patch.

$ cd ../gemilang--dev
$ tla replay gemilang--rel--1.0--patch-1
$ tla commit -L 'apply fix patch-1 from gemilang--rel'