On Fri, Jul 27, 2007 at 02:02:14PM +0200, Piet-Hein Peeters wrote:
> The commaned executed is:
> svnmerge.py merge -r1:11211 D:\dev\merge-pmw72 -S
> [2]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,1085
> 2-10859,10861-10862,10864,10866,10870-10871,10873-10874,10880-10884,10
> 891-10893,10896,10899-10900,10906-10914,10918,10921,10923,10928,10938-
> 10939,10944-10948,10951,10954-10964,10968-10971,10974-10976,10981-1098
> 4,10992-10993,11006-11008,11010-11012,11018-11021,11023,11026-11027,11
> 032,11037-11040,11042-11046,11050,11052,11060,11066-11069,11079,11081-
> 11082,11084,11086,11091-11092,11097-11100,11106-11107,11110-11111,1111
> 5,11121,11124,11128-11130,11132,11136,11138-11141,11143,11145,11147-11
> 148,11150,11153-11155,11157-11158,11160,11162-11163,11165-11166,11172,
> 11174-11175,11177,11182,11185-11187,11192,11202,11205-11211 via
> svnmerge from
> [3]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
> [4]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
> ........
svnmerge is listing the phantom revisions that it merged as well. Your
suggestion, then, is to not list phantom revisions within the merge
message? How do others feel about this?
As a quick fix, you could just merge the *new* revisions:
svnmerge merge -r11211 D:\dev\merge-pmw72 -S
Dustin
--
Dustin J. Mitchell
Storage Software Engineer, Zmanda, Inc.
http://www.zmanda.com/
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
