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

RE: Problems Merging

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-05-10 23:54:02 CEST

On Mon, 2004-05-10 at 16:49, Stephen Hansen wrote:
> *blink* That's complicated.

> So, still missing targets and working copy locks, neither of which error
> message mean anything useful to me. The 'skipped missing targets' there
> are actually files which are in the branch that are supposed to be added
> into the trunk. And the working copy not locked error is a directory
> with files in it that are 'new'...

It looks like that when you compare the base and tip of the branch, you
end up with a "patch" that doesn't cleanly apply to your trunk working
copy. Any idea why that's happening?

For example, the 'skipped missing targets' stuff... were those files
actually first created in the branch?

In other words, it seems that the patch generated by 'svn merge' assumes
certain paths already exist in the trunk, when in factthey don't. That
would imply that somehow that these paths were deleted from the trunk
after the branch was created, and yet the branch still changed things
within them?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 10 23:58:30 2004

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.