On Aug 2, 2011, at 11:50 AM, Blair Zajac wrote: > > On Aug 2, 2011, at 11:44 AM, [email protected] wrote: > >>> I think you should pick svnmerge.py or built-in merge tracking. >>> At this point, I recommend svn's built-in merge tracking, the only >>> thing it doesn't have is a nice way of blocking revisions from merging. >> >> Does the built-in merge mechanism preserve any revision comments? >> >> Or I guess to ask another way ... when I merge changes with "svn merge", the >> commit comment is purely decided by me. >> How does a third party easily see what revisions I merged, and the commit >> logs for those revisions? > > svn built-in merging doesn't do that because you can get with log's -g > command line option the log messages of what was merged. This is better in > some way because if you fix the original log message, say a typo, then you > only need to fix it once. With svnmerge.py, I've had to tweak three log > messages because the text was copied from revision to revision.
BTW, this all presumes your svn client and server are at least 1.5. If the server is on 1.4, then stick with svnmerge.py. I also recommend using the latest svn 1.6.x versions if you're doing any merging, as each svn minor release fixes some merge bug. Blair _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
