[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

"Skipped missing target" merging back to trunk

From: spinn <spinn_at_spinnwebe.com>
Date: 2005-10-04 06:59:13 CEST

Hello. Apologies in advance for the probable lack of information in
this question; relatively new to svn, not sure how to get full
outputs to fully describe my situation. Hoping the general question
is clear enough.

We have a trunk, and a feature branch. We're done with the feature
branch, so I want to merge those changes back into the trunk. With a
working, updated copy of the branch, I merge the changes from the
trunk into the branch. This appears to work how I expect.

The svn book says, at this point I should merge changes from rHEAD of
the branch to rHEAD of the trunk, into the trunk. I get a working
copy of the trunk and run the merge. When I do that, I get "skipped
missing target" for files that were added to the branch, rather than
the merge creating them and doing svn add on them as I think I should
expect. (This was a merge, not a dry run, and I saw the files didn't
exist in the trunk working copy afterwards.)

As I was searching the archive for answers, I found this:


in which Ben Collins-Sussman says this happens when a user
incorrectly compares the wrong trees...but as far as I can tell, I'm
following the best practices instructions. Given those instructions,
I can't see any way to merge back into the trunk in a way that
includes the svn add events in the branch.

But, everything I've seen involving "skipped missing target" is
generally answered by saying "the user screwed up somewhere", but I
feel like I'm following the directions provided. Anyone have a hint
what I'm doing wrong, or if this is too vague, can tell me the best
way to provide information that more clearly will illustrate my
problem? (I'm using TortoiseSVN, if it matters, though I'm familiar
enough with command line svn if outputs are required.)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 4 07:00:39 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.