Scott wrote: > Please edit the default merge comments when you merge using > svnmerge so that the 'headline' (the first line of the > comment) is about what change you're merging rather than the > fact that it is a merge. > > Personally, I don't find much value in the merged revision > numbers as a comment at all - it's all in the svn properties, > but I don't mind if they are there, I'd just prefer that the > real change be the first line so that when scanning the > revision history it's clear what change is being merged.
I've added a new Wiki article about using svnmerge.py to port version branch changes into the main branch. It includes a proposed policy, which adheres to Scott's suggestion above. http://wiki.sipfoundry.org/x/aIJU -Paul [email protected] _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev sipXecs IP PBX -- http://www.sipfoundry.org/
