[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: Stephen Hansen <shansen_at_advpubtech.com>
Date: 2004-05-11 01:15:50 CEST

> -----Original Message-----> 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?

Hmn. My repository is in a bad state at the moment.

Some changes were made, from 174-183, which ended up being a big horny
issue, so it was decided to branch them off into another universe. So,
183 was branched off into /branch/omniorb, and then the state of the
trunk/ repository was reverted back to what it was at 173. It continued
along doing stuff. The branch changes were finished, and the repository
level is now 217.

I'm fairly certain the files in question were made in the branch only.
At least the directory which is throwing the 'not locked' error.

The end effect is not a /huge/ amount of changes, so if I have to I can
manually merge this up.. but I would rather not.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 11 01:16:27 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.