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

[Piet-Hein Peeters]

Hello,

I've tested the patch of Alan and it works perfectly fine for us.
So I'm in favor of commiting it if I have a vote here.

Regards,
Piet-Hein Peeters



                                                                           
                                                                           
                                                                           
                                                                        To 
                                       svnmerge at orcaware.com               
                                                                        cc 
     Daniel Rall                       Piet-Hein                           
     <dlr at collab.net>                  Peeters/BST/MS/PHILIPS at PHILIPS      
                                       Alan Barrett <apb at cequrux.com>      
     Sent by:                                                      Subject 
     svnmerge-bounces+pie              Re: [Svnmerge]                      
     t-hein.peeters=phili              svnmerge-commit-message.txt shows   
     ps.com at orcaware.com               wrong information.                  
                                                            Classification 
     07/30/2007 05:46 PM                                                   
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           




This looks good to me.  Assuming Piet-Hein's tests pan out, +1 on
committing it.

On Mon, 30 Jul 2007, Piet-Hein Peeters wrote:

>
> Thanks for this patch,
>
> I'll test it and let you know.

> > Alan wrote:
> 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
[attachment "atteebw4.dat" deleted by Piet-Hein Peeters/BST/MS/PHILIPS]
_______________________________________________
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/20070801/9755ae0f/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/20070801/9755ae0f/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic01172.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070801/9755ae0f/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/20070801/9755ae0f/attachment-0008.gif>