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

Merge command failed

From: Bob Peterson <bob_at_memento-inc.com>
Date: 2005-12-14 20:27:16 CET

I have been performing merges just fine until now. When I perform this
merge from our trunk to my working copy in my personal branch, I get
this message:

Working copy 'C:\...my path...\Search' is missing or not locked
Please execute the "Cleanup" command.

What could this mean? What do I do to fix it? The Cleanup command -has
been- performed. This working copy is -pristine-, it has no local
changes. I know, because I have done a Revert a number of times here to
back out the partial merge attempts.

Some points:

1) The folder Search was added at rev 6021, before I made the branch. I
made the branch by creating an empty folder in the repository, and the
copying (strictly within Subversion) only those subfolders of trunk that
I needed. I've made a few merges in from trunk, to keep my branch up to
date, and one merge back to trunk to put in my changes when they were ready.

2) I am forced to use the "_svn" build of TortoiseSVN because I am doing
some ASP.NET development. There are no command line builds of svn that
use "_svn" as the bookkeeping folder.

3) When I do a dry run merge, I see a number of files naturally marked
as skipped, since my branch isn't interested in the whole kit and
kaboodle of trunk. The weird thing is, some are "Skipped" and others
are "Skipped missing target". That is just too confusing to me. I
mention this because, despite having see many prior files marked skipped
one way or the other, I see exactly one "Skipped missing target" before
the merge failure, cutting off just before the dry-run's next message,
which is "Skipped". I mention this in case the two flavors of skip
messages are relevant.

Thanks in advance,
\bob peterson

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 14 20:38:05 2005

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