On 4/20/07, Brown, Carlton <Carlton.Brown@bellsouth.com> wrote:
> 1) I am looking for a specific explanation of the errors "Skipped" and
> "Skipped missing target." I don't buy this weak explanation of "the user
> screwed up" because that isn't always accurate. I want to know exactly
> what conditions cause the tool to throw these 2 specific errors.
>
> 2) I am looking for a way while merging to force a conflict if a file was
> deleted in 1 location and but merely changed in the other location.
>
> I'm getting these 2 errors "Skipped" and "Skipped missing target." when I
> perform a merge in which certain files were refactored. By that I mean
> they were renamed (deleted then added) in one branch, but they had edits in
> another branch due to bugfixes or new feature development.
>
> The documentation says that "Skipped" errors mean "the user did something
> wrong." This might be a valid explanation sometimes, but refactoring is not
> "wrong", it is a normal part of software development in a mature project.
> And in a large, active project, it may happen that a file gets renamed in
> one branch but edited in another branch, due to miscommunication or whatever
> reason. Again, not necessarily "wrong", just exceptional.
>
> That being the case, the description "the user did something wrong" is
> really a lame cop-out to avoid saying "the tool encountered a situation it
> could not handle." I want to know exactly what those situations are, and
> exactly what the messages mean, so I can figure out what external
> workarounds and tracking we need to put in place.
If that is what the documentation says, you are rights that could it be better.
When you do a merge, think of the process as creating a patch and then
applying it to your WC. When there are just changes to a file (as
opposed to addition of a whole file) if the merge process cannot find
the target it issues this skip message.
So one common reason for this is that the user made a mistake in the
URL or paths, and Subversion is not finding any of the files, because
the folder depth is wrong. But you are right, there are also
legitimate cases, such as the one you describe where you will get
this.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 20 21:35:41 2007