-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Rick Tanner wrote: > > A couple of people have suggested using svnmerge.py to manage and track > merges (or backports) from Trunk to Branch. > > So, I have volunteered and taken the initiative to start on this right > away for maps only.
I've found some problems with using this. Svnmerge requires an "all or nothing" approach for merging. For instance, r9738 was some map changes to update or add the difficulty level to 14 maps. At least 4 of those maps were not in branches/1.x; so svnmerge would not merge the changes. For the time being, I will continue to manually backport changes. If anyone else is interested in trying this out and showing how it can work - by all means, please do. Thanks. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIrHZLhHyvgBp+vH4RAvyBAJ4rZJARRtvMDpZM3B3R9lD5jGig6gCfeJEc CjuwZZXtpByA/Ce330wxl94= =FPhx -----END PGP SIGNATURE----- _______________________________________________ crossfire mailing list crossfire@metalforge.org http://mailman.metalforge.org/mailman/listinfo/crossfire