[crossfire] Using svnmerge for backporting to branch?

[Nicolas Weeger]

Hello.

> After applying a trivial bug fix for the manual pages of the clients, I
> thought about merging the patch to the 1.x branch.  However, it looks like
> all previous merges have been done by hand (hopefully using "svn merge")
> instead of using automated tools like "svnmerge" (no space).  Or at least,
> I was unable to find the svn properties that are usually stored by
> svnmerge when it is used.

I have no objection to use svnmerge, but as you point out *everyone* should it 
if we decide to use it.

I would say for current trunk/branch it may not be that required, as I fully 
expect branch To Die Soon (tm) :)
Except for bugfixes, of course.

So maybe for the future 3.0 branch?

Nicolas
-- 
http://nicolas.weeger.org [Petit site d'images, de textes, de code, bref de 
l'aléatoire !]
-------------- 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://mailman.metalforge.org/pipermail/crossfire/attachments/20080214/a9e3762d/attachment.pgp