On Friday, December 11, 2020 at 5:32:55 PM UTC+1 Tobias Knauss wrote:
> 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? > you don't have to lock that file: the file is at a new location locally, so all other users don't have that file (yet). Only once you commit the merge and the moved folder/file, *then* you can lock the file because then it has a 'connection' to the repository. > > 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? > > I'm working on a workaround the svn lib problem here when doing a diff-against-base. However the status will still be reported as normal. And "added" would be wrong too: the file in relative to it's parent folder wasn't added at all but stayed the same. -- 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/1eabddae-9e57-4235-b19f-0cd3ff0bf045n%40googlegroups.com.
