Stefan schrieb am Freitag, 11. Dezember 2020 um 16:59:12 UTC+1: > 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 > > Which solution do you suggest for locking a repo that has such changes? Should I use the repo browser and lock the unchanged head revision in it? Would it make sense to automatically adapt the chosen files in the background (exclude local new files from the locking list, add local deleted ones), so that the locking operation achieves the expected result?
Okay, if the svn lib reports "normal (+)", then you can do nothing about it but forward it to the user. But isn't this a bug in the svn lib then? In my opinion, "normal (+)" is wrong, it should be "added (+)" as mentioned above, also because your Commit dialog is not able to link the added and the deleted file and open a comparison with both. What do you think about it? -- 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/1a434073-9a0f-4384-be51-0cd4189c81e2n%40googlegroups.com.
