[Svnmerge] svnmerge-commit-message.txt shows wrong information.

[Piet-Hein Peeters]

Thanks for this patch,

I'll test it and let you know.

Regards,
Piet-Hein Peeters
Software Configuration Manager
----------------------------------------------------------------------------

Philips Medical Systems - Healthcare Informatics / PII
Room QV-136, P.O. Box 10.000, NL - 5680 DA Best
Phone +31 40 27 62016
----------------------------------------------------------------------------


                                                                           
                                                                           
                                                                           
                                                                        To 
                                       svnmerge at orcaware.com               
                                                                        cc 
     Alan Barrett                                                          
     <apb at cequrux.com>                                             Subject 
                                       Re: [Svnmerge]                      
     Sent by:                          svnmerge-commit-message.txt shows   
     svnmerge-bounces+pie              wrong information.                  
     t-hein.peeters=phili                                   Classification 
     ps.com at orcaware.com                                                   
                                                                           
     07/28/2007 06:20 PM                                                   
                                                                           
                                                                           
                                                                           
                                                                           




On Sat, 28 Jul 2007, Dustin J. Mitchell wrote:
> On Sat, Jul 28, 2007 at 11:42:08AM +0200, Alan Barrett wrote:
> > I patched my copy of svnmerge.py long ago to prevent it from listing
> > phantom revisions in the log message.
>
> I think the case has now been made for this change.  Is there any
> chance you would want to make your patch available?

It's only one line, and it doesn't do anything like what I suggested in
my previous message; all it does is omit the phantom revisions from the
log message.  Here's the patch:

--- svnmerge.py
+++ svnmerge.py
@@ -1084,7 +1084,7 @@
                   (revs | phantom_revs, NAME)
         else:
             print >>f, 'Merged revisions %s via %s from ' % \
-                  (revs | phantom_revs, NAME)
+                  (revs, NAME)
         print >>f, '%s' % opts["head-url"]
         if opts["commit-verbose"]:
             print >>f

--apb (Alan Barrett)
_______________________________________________
Svnmerge mailing list
Svnmerge at orcaware.com
http://www.orcaware.com/mailman/listinfo/svnmerge
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070730/01bb0eec/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graycol.gif
Type: image/gif
Size: 105 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070730/01bb0eec/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic04145.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070730/01bb0eec/attachment-0007.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ecblank.gif
Type: image/gif
Size: 45 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070730/01bb0eec/attachment-0008.gif>