How to keep overview of branches and merges ( was /people/lazyboy/r-2_8_4-fai-cd_sarge_fixes - two bugfixes merged together)

[Henning Sprang]

Hi, 
I did some further research about that. Found some links - I did myself
not fully read them yet, but from looking over they seem interesting:

Longer text about merge tracking when using subversion:
http://freehackers.org/~shlomif/svn-raweb-light/subversion.cgi/trunk/notes/merge-tracking.txt

Some best practices for working with subversion:
http://freehackers.org/~shlomif/svn-raweb-light/subversion.cgi/trunk/doc/user/svn-best-practices.html

svnmerge, a helper tool for tracking merges in subversion:
http://www.dellroad.org/svnmerge/index


Henning
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.uni-koeln.de/pipermail/linux-fai-devel/attachments/20051028/20c5b23c/attachment.bin