[Svnmerge] phantom revisions in Commit messages

[Piet-Hein Peeters]

Hello,

I would really like to see the patch below committed in svnmerge.py.
Can somebody please give me an update if and when this is going to happen?

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 
                                       Christoph Bartoschek                
                                       <bartoschek at or.uni-bonn.de>         
     Piet-Hein Peeters                                                  cc 
                                       svnmerge at orcaware.com               
     Sent by:                          svnmerge-bounces+piet-hein.peeters= 
     svnmerge-bounces+pie              philips.com at orcaware.com            
     t-hein.peeters=phili                                          Subject 
     ps.com at orcaware.com               Re: [Svnmerge] Commit messages      
                                                            Classification 
     08/07/2007 08:23 AM                                                   
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           




Hello,

There is a patch for this, see the mail below:

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)

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
----------------------------------------------------------------------------


svnmerge-bounces+piet-hein.peeters=philips.com at orcaware.com wrote on
08/06/2007 06:08:34 PM:

> Hi,
>
> the commit messages created by svnmerge.py seem to contain the whole
history
> of revisions already merged. For example when I just merged revision
4758, I
> get the following commit message in svnmerge-commit-message.txt:
>
> Merged revisions
> 4688-4706,4709-4711,4713-4736,4738-4739,4744-4747,4749-4753,4755-4758 via

> svnmerge from http://maximator:8080/bonntools/etopt/trunk
>
>
> Is it normal that the list gets longer and longer?
>
> Greetings
> Christoph Bartoschek
> _______________________________________________
> Svnmerge mailing list
> Svnmerge at orcaware.com
> http://www.orcaware.com/mailman/listinfo/svnmerge
_______________________________________________
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/20071205/37ed3c25/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/20071205/37ed3c25/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic02706.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20071205/37ed3c25/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/20071205/37ed3c25/attachment-0008.gif>