svn 1.5 introduced merge tracking, and as of 1.5.4 it works pretty well. You can merge all unmerged changesets from the trunk to a feature branch, and then reintegrate that branch, bringing all changes to the trunk, and then delete the feature branch.
pgpmTYWUzhkMD.pgp
Description: PGP signature
------------------------------------------------------------------------------
_______________________________________________ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
