/people/lazyboy/r-2_8_4-fai-cd_sarge_fixes - two bugfixes merged together

[Henning Sprang]

Hi,
To test merging in an uncritical area, I put the two new fai-cd patches
together in the branch /people/lazyboy/r-2_8_4-fai-cd_sarge_fixes.

Merging itself is easy, but keeping track of which branch has been
merged into which other one will be important. The svn book recommends
using log message, that could work well. I explicitly wrote every
argument for the merge commands in the logs.

On the other hand, when multiple merges and branches exits in some time,
log messages can be difficult to oversee and are vulnerable to syntax
errors (simple example: you won't find commit message where somebody
writes "merging" when grepping for merge). Maybe a spreadsheet or a
database should be used sometime, until then the wiki might prove
useful.

What do you think?

Henning