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

Problems Merging

From: Stephen Hansen <shansen_at_advpubtech.com>
Date: 2004-05-10 23:10:46 CEST

Hi all.
    I'm a fairly new user to Subversion and have been using it on new
projects around the office, and have run into a bit of a problem with
merging. I branched /trunk/Python into /branch/omniorb awhile back to do
some extensive work, and now would like to merge my changes back into
the trunk. So, I do:
svn merge
And I get:
Skipped missing target: 'Scripts/CreateBatchFiles.py'
Skipped missing target: 'Scripts'
Skipped 'DLLs/_omnicodesets.pyd'
Skipped 'DLLs/_omnipy.pyd'
Skipped missing target: 'DLLs'
Skipped missing target: 'pywin32.pth'
svn: Working copy 'Lib/site-packages/apt/test' not locked

I don't know what those actually mean; skipped missing target sounds
like there is no such file in the trnk, at which point i'd expect the
merge to add it if it existed in the branch... and the working copy not
locked error has me totally baffled.
What's this mean?

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:11:46 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.