> > > Still I want to know exactly what is the difference between
> > "Skipped"
> > > and "Skipped missing target" if anyone knows.
>
> . . . .
>
> I've seen this when merging and from what I remember:
>
> "Skipped" means there's a file in the To branch that isn't in
> the From branch. There's a file on which Subversion can
> apply a delta, but there's no file from which a delta can be
> figured out. Subversion has a file it can update, but
> doesn't know how to update it.
No, I'm certain that's not true (I've just made a try)
I'm quite sure that Subversion does not look at the list of the files of the target workspace. It's just applying the diff on the path that have a diff independently of the all content list of the target.
> "Skipped missing target" means there's a file in the From
> branch that isn't in the To branch. So there's a file from
> which Subversion can find a delta, but no file to which that
> delta can be applied. Subversion knows how to change the
> file, but doesn't have a file it can change.
Yes, that's true.
However it's not really good to talk about "From branch" and "To branch". That's a bad shortcut. We should say:
There's a file in the diff/patch that isn't in the working copy.
But I can't really explain the "Skipped" message. I did not find any practical way to get it. If you are able to do so, I'm interested.
Looking at Subversion code, the case is processed in the subversion/svn/notify.c:
case svn_wc_notify_skip:
if (n->content_state == svn_wc_notify_state_missing)
{
if ((err = svn_cmdline_printf
(pool, _("Skipped missing target: '%s'\n"),
path_local)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf
(pool, _("Skipped '%s'\n"), path_local)))
goto print_error;
}
break;
But I'm not able to find the case where n->content_state is different from svn_wc_notify_state_missing.
Regards
Christophe
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 21 10:55:07 2007