Re: Merge skipping newly added files

On Mar 3, 2005, at 6:52 AM, Robert Swarbrick wrote:

> Hi all,
>
> We've a couple of branches in the system I work on, and in trying to
> merge from one branch to trunk I keep getting "Skipped missing target".
>

Whenever you see this message, it means you're merging the wrong
revision range. You're specifying a "patch" which doesn't apply
cleanly to your working copy. It's very much like the GNU patch
program giving errors about "failed hunks".

In your particular case, it sounds like both the left-tree and
right-tree that are being compared already contain the "error"
directory, but the working copy does not. The merge command won't
magically auto-create files and dirs for you unless the left-hand tree
*doesn't* contain the item and the right-hand tree *does* contain the
item.

The solution? You should be comparing different trees -- the revision
range should include whatever revision the 'error' directory first came
into existence.

I'm not familiar with TSVN's merge command very well, so I can't give
more details than that.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 3 14:04:52 2005