with your test repo, I do the merge from branches/b01 into my wc from trunk. Then committing works fine. Getting a lock is obviously not possible because the only file is moved but not committed yet. So you can't get a lock without committing the move first. And yes: in the commit dialog the file is shown as "normal (+)", but that's what the svn lib reports. You can try it yourself by running svn st -v and you'll get: M 4 2 toknauss . D 4 2 toknauss doc01.txt A + - 4 toknauss folder_a + - 4 toknauss folder_a\doc01.txt
-- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/59246e66-7652-447e-ada1-83a6c2bf1511n%40googlegroups.com.
