Merging bug

Hi folks!

I've got a small problem trying to do a merge:

% svn merge -r 126:158 https://somewhere/apt-rpm/vendor/trunk
U test/rpmver.cc
C test/versiontest.cc
U test/versions.lst
U test/conf.cc
U test/scratch.cc
Skipped missing target: test/CVS/Entries
Skipped missing target: test/CVS
U test/extract-control.cc
U test/testextract.cc
Skipped missing target: debian/control
Skipped missing target: debian/compat
Skipped missing target: debian/postinst
Skipped missing target: debian/postrm
Skipped missing target: debian/changelog
Skipped missing target: debian/rules
Skipped missing target: debian/CVS/Entries
Skipped missing target: debian/CVS
Skipped missing target: debian/bugscript
Skipped missing target: debian/apt-utils.manpages
Skipped missing target: debian/apt.manpages
svn: Working copy not locked
svn: directory 'debian' not locked

That's certainly due to the fact that the 'debian' directory has
been removed locally (and committed already).

Doing "mkdir debian; svn add debian" and restarting the merge
fixes the problem.

-- 
Gustavo Niemeyer
http://niemeyer.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org