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

Fri Jul 27 05:00:09 PDT 2007

P.S. The properties have the correct value after the merge:
svnmerge-blocked: /branches/pmw:10823,10973
svnmerge-integrated: /branches/pmw:1-10822,10824-10972,10974-11211

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 
     Piet-Hein Peeters                                                     
                                                                   Subject 
     07/27/2007 02:00 PM               svnmerge-commit-message.txt shows   
                                       wrong information.Link              
                                                            Classification 
                                       Unclassified                        

Hello,

I have a case in which we merge every revision from a branch (called pmw)
to trunk.

The svnmerge properties on the trunk before the merge are:
svnmerge-blocked: /branches/pmw:10823,10973
svnmerge-integrated: /branches/pmw:1-10822,10824-10972,10974-11204

When I perform the merge, I merge from 1 to the last built revision, in
this case 11211.
The commaned executed is:
svnmerge.py merge -r1:11211 D:\dev\merge-pmw72 -S
https://mip.sc-phlps.sfo.collab.net/svn/mip/branches/pmw

The svnmerge-commit-message.txt shows the following text after the merge:
Merged revisions
10824-10827,10831-10835,10838-10839,10842,10844-10845,10848-10849,10852-10859,10861-10862,10864,10866,10870-10871,10873-10874,10880-10884,10891-10893,10896,10899-10900,10906-10914,10918,10921,10923,10928,10938-10939,10944-10948,10951,10954-10964,10968-10971,10974-10976,10981-10984,10992-10993,11006-11008,11010-11012,11018-11021,11023,11026-11027,11032,11037-11040,11042-11046,11050,11052,11060,11066-11069,11079,11081-11082,11084,11086,11091-11092,11097-11100,11106-11107,11110-11111,11115,11121,11124,11128-11130,11132,11136,11138-11141,11143,11145,11147-11148,11150,11153-11155,11157-11158,11160,11162-11163,11165-11166,11172,11174-11175,11177,11182,11185-11187,11192,11202,11205-11211
 via svnmerge from
https://mip.sc-phlps.sfo.collab.net/svn/mip/branches/pmw

........
  r11211 | sandhyakrishnan | 2007-07-27 06:51:38 +0200 (Fri, 27 Jul 2007) |
1 line

  Corrected the issue of renaming when file with same name already exists
........

Note that only r11211 is actually merged, all other revisions do NOT exist
on the pmw branch.

In my opinion, the svnmerge-commit-message.txt file should contain the
following text:
Merged revisions 11211 via svnmerge from
https://mip.sc-phlps.sfo.collab.net/svn/mip/branches/pmw

........
  r11211 | sandhyakrishnan | 2007-07-27 06:51:38 +0200 (Fri, 27 Jul 2007) |
1 line

  Corrected the issue of renaming when file with same name already exists
........

Can anyone please pick this up and fix this.

Regards,
Piet-Hein

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
----------------------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070727/8d4a8cc9/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/20070727/8d4a8cc9/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic15277.gif
Type: image/gif
Size: 1003 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070727/8d4a8cc9/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/20070727/8d4a8cc9/attachment-0008.gif>