Max Bowsher wrote:
> Ronan Meneu wrote:
>
>> Hello,
>>
>> I'm using svn version /1.0.6 (r10360).
>>
>> /If i want to merge from trunk to branch, i use for instance:
>>
>> svn merge -r 50: 60 trunk/ branch/mybranch
>>
>> //I have made lots of try, and it works well on my training repository.
>> Doing the same thing on my real repository, i get some :
>>
>> Skipped missing target:
>>
>> It seems to occur on new directories. I have doublechecked my merge
>> parameters, doing a svn diff first, to verify that diffs exist.
>> Are there known issues about this problem ? I have queried and found
>> some merge problems, supposed to be fixed in my svn version.
>> Is there a workaround ? am i using merge command badly ?
>
>
> It appears so. I think you want something more like:
>
> cd branch/mybranch
> svn merge -r50:60 ../../trunk
>
That's exactly what i have tried first. The syntax you mention is
similar to mine, except that you don't mention the optional path,
because you're already in the branch.
It is documented as the second syntax of the 'svn merge' command.
svn merge -r N:M SOURCE [PATH]
In the second form, /SOURCE/ can be a URL or working copy item, in which case the corresponding URL is used.
This URL, at revisions /N/ and /M/, defines the two sources to be compared.
Anyway, it's the same result.
The problem, to be more precise, is around directories created in the
trunk. They are not created in the branch, and what is mentionned to be
"skipped missing target" is the content of these directories.
Any ideas why ?
Ronan
> Please read "svn merge --help" and the book, and give more detail of
> exactly what you are trying to do, including exact merge command lines
> and output, if that does not make things clear.
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 14 16:25:54 2004