On Friday 20 April 2007, Brown, Carlton wrote:
> Hi all, I have 2 questions:
>
> 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.
Look in the archives for the thread with this subject:
rename overwrites code: this a reasonable interim solution?
That should get you started.
HTH,
Eli
---------------------------------------------------------------------
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:41:50 2007