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
                                       [email protected]           
                                                                        cc
     Alan Barrett                                                      
     <[EMAIL PROTECTED]>                                             Subject
                                       Re: [Svnmerge]                  
     Sent by:                          svnmerge-commit-message.txt shows
     svnmerge-bounces+pie              wrong information.              
     t-hein.peeters=phili                                   Classification
     [EMAIL PROTECTED]                                               
                                                                       
     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
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge

<<inline: graycol.gif>>

<<inline: pic04145.gif>>

<<inline: ecblank.gif>>

_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge

Reply via email to