Re: [Subclipse-users] Could not commit directory deletion in branch reintegration

Hendrik Maryns schreef:
> Hello all,
>
> I just did the reintegration of a branch. The CollabNet merge client
> did its job fine, I edited some more files, deleted some stuff etc.
> Then, wanting to commit, I kept everything selected, but got the following:
>
> Trying to use an unsupported feature
> svn: Cannot non-recursively commit a directory deletion
>
> Using the command line and simply leaving off the -N option, I was able
> to commit this without problem.
>
> I also found http://svn.haxx.se/tsvn/archive-2006-04/0130.shtml on how
> Tortoise handles this and I think Subclipse should do the same thing.

This is very probably due to stray svn:mergeinfo on some files or
folders. Try deleting all of those except on the root folder you did
the merge on. Afterwards it will work. (You’ll have to commit first, of
course. It is also a good idea to remove that information on the branch
you merged from, if it is not a reintegration merge. Only the root
folders of your project should have the property set. Yes, there are
some cases in which it shouldn’t, but if you always do a merge on the
root folder, this is the easiest solution.) I consider this a bug in
Subversion, I guess I should report it.

H.

-- 
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=985648
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].