[Svnmerge] Pending patch to handle svnmerge-integrated prppertyconflicts

[Piet-Hein Peeters]

Hello Raman,

How about simular conflicts on the svnmerge-blocked property?
Is that also fixed already? I raised that issue March 29 already, but I'm
still waiting for the solution.

Regards,

Piet-Hein Peeters
Software Configuration Manager
HI / PII
Philips Medical Systems
The Netherlands






                                                                           
                                                                           
                                                                           
                                                                        To 
                                       Svnmerge <svnmerge at orcaware.com>    
                                                                        cc 
     Raman Gupta                                                           
     <rocketraman at fastmai                                          Subject 
     l.fm>                             [Svnmerge] Pending patch to handle  
                                       svnmerge-integrated                 
     Sent by:                          prppertyconflicts                   
     svnmerge-bounces+pie                                   Classification 
     t-hein.peeters=phili                                                  
     ps.com at orcaware.com                                                   
                                                                           
     07/05/2007 01:51 AM                                                   
                                                                           
                                                                           
                                                                           




Ok, I see from recent emails it seems we have new maintainers for
svnmerge.py... any chance you could review the following pending patch:

http://tinyurl.com/3c229c

There was lots of discussion about it, but IMHO never any good reasons
to not commit it. See this email (which never got a response):

http://tinyurl.com/39h6x5

Cheers,
Raman Gupta
_______________________________________________
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/20070705/f804d937/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/20070705/f804d937/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic31616.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070705/f804d937/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/20070705/f804d937/attachment-0008.gif>