On 11/1/06, <b class="gmail_sendername">Aaron VonderHaar</b> <<a href="mailto:gruen0aermel@gmail.com">gruen0aermel@gmail.com</a>> wrote:<div><span class="gmail_quote"></span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
I am trying to use the "svk merge" command and I don't understand why I<br>get the error "Revision spec must be N:M"<br><br>If I run the following I get what I expect for diff and log, so I don't<br>understand why the same syntax doesn't work for "merge"
<br><br>$ svk log -r 643@:655@ //mirrors/repo/branches/dev2<br>## ... expected log output ...<br>$ svk diff -r 643@:655@ //mirrors/repo/branches/dev2<br>## ... expected diff output ...<br>$ svk merge -r 643@:655@ //mirrors/repo/branches/dev2
<br>//mirrors/repo/branches/dev1-merge<br>Revision spec must be N:M.<br><br><br>My setup is basically this:<br>$ svk cp //mirrors/repo/trunk //mirrors/repo/branches/dev2<br>$ svk smerge -Il //mirrors/dev2-repo/trunk //mirrors/repo/branches/dev2
<br>$ svk cp //mirrors/repo/trunk //mirrors/repo/branches/dev1-merge<br><br>I want to merge a range of dev2's changes into the dev1-merge branch<br>(and eventually merge that branch into the trunk), but I am stuck on<br>this "svk merge" syntax".
<br><br>Thanks for any help explaining to me what this "Revision spec must be<br>N:M." error means.</blockquote><div><br>I ran into a similar scenario today and turned to the #svk irc channel. They reported that the merge command supports revnum@ syntax in trunk only.
<br><br>So, barring that, I did svk log to determine the local revision numbers then fed those to merge. Cumbersome, but it works.<br><br>I don't know why revnum behavior changes per command.<br><br>jeremy<br> </div></div>