> -----Original Message-----
> From: [email protected]
> [mailto:[email protected]] On Behalf Of
> Scott Lawrence
> Sent: Wednesday, April 14, 2010 7:49 AM
> To: sipXecs developers
> Subject: [sipX-dev] Merged comments
>
> 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.
>
>
Sorry, missed updating the headline properly on my last merge.
I'm seeing a bunch of extra files included every time I merge;
any idea why they're there and how to eliminate them?
Changed files:
* extras/doggerel
*
* sipXopenfire/src/presence-plugin
* lib/freeswitch/upgradenotes.txt
* sipXpbx/etc/phonelog.conf
* sipXopenfire/presence-plugin/plugin.xml
* sipXopenfire/presence-plugin/web
Dave
_______________________________________________
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/
