[svk-devel] svk merge: "Revision spec must be N:M."

[Jeremy Kemper]

On 11/1/06, Aaron VonderHaar <gruen0aermel at gmail.com> wrote:
>
> I am trying to use the "svk merge" command and I don't understand why I
> get the error "Revision spec must be N:M"
>
> If I run the following I get what I expect for diff and log, so I don't
> understand why the same syntax doesn't work for "merge"
>
> $ svk log -r 643@:655@ //mirrors/repo/branches/dev2
> ## ... expected log output ...
> $ svk diff -r 643@:655@ //mirrors/repo/branches/dev2
> ## ... expected diff output ...
> $ svk merge -r 643@:655@  //mirrors/repo/branches/dev2
> //mirrors/repo/branches/dev1-merge
> Revision spec must be N:M.
>
>
> My setup is basically this:
> $ svk cp //mirrors/repo/trunk //mirrors/repo/branches/dev2
> $ svk smerge -Il //mirrors/dev2-repo/trunk //mirrors/repo/branches/dev2
> $ svk cp //mirrors/repo/trunk //mirrors/repo/branches/dev1-merge
>
> I want to merge a range of dev2's changes into the dev1-merge branch
> (and eventually merge that branch into the trunk), but I am stuck on
> this "svk merge" syntax".
>
> Thanks for any help explaining to me what this "Revision spec must be
> N:M." error means.


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.

So, barring that, I did svk log to determine the local revision numbers then
fed those to merge.  Cumbersome, but it works.

I don't know why revnum behavior changes per command.

jeremy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-devel/attachments/20061101/16177552/attachment.htm