You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Ronan Meneu <rm...@eprocess.fr> on 2004/12/14 10:48:56 UTC
"Skipped missing target" problem
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 ?
Thanks,
Ronan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: "Skipped missing target" problem
Posted by Ben Collins-Sussman <su...@collab.net>.
On Dec 14, 2004, at 9:30 AM, Ronan Meneu wrote:
>
> 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 ?
>
'svn merge' compares two trees, creates a 'patch', then applies that
patch to a working copy.
If you ever see "skipped missing target" messages, that means you have
defined a patch which does not cleanly apply to your working copy.
Just like the 'patch' program complains about "failed hunks" not
applying, 'svn merge' is doing the same thing.
So, for example, if you compare two trees with the merge command, and
the resulting patch includes a change to foo/bar/baz.c, but the 'bar'
directory doesn't exist in your working copy, you'll get messages about
"skipping" over that part of the patch. It cannot change foo/bar/baz.c
if the path doesn't exist!
Most of the time this problem happens because users are confused and
are specifying the wrong trees to compare. So the solution is:
compare different trees. For example, you probably need to define a
patch that includes the *creation* of the bar directory.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: "Skipped missing target" problem
Posted by Ronan Meneu <rm...@eprocess.fr>.
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
Re: "Skipped missing target" problem
Posted by Max Bowsher <ma...@ukf.net>.
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
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