Kyle Cordes wrote:
> SVN branching is OK, but not great. ... SVN merging is very weak, because SVN
does
> not actually know you merged, so it can't help re-merge later changes
> from the same branch, etc.


My team has been using svnmerge for a couple years and it does exactly
that: track which revisions have been merged from each branch. You can
tell it to merge specific revisions or all that haven't been merged. It
tracks which revisions have been merged in an svn property called
svnmerge-integrated.

http://www.orcaware.com/svn/wiki/Svnmerge.py

It's a little crude but works well enough for simple branching strategy.

That said, I'm interested in learning more about git after watching
the video of Linus's talk.

Mike Jorgensen