Tobias Knauss schrieb am Donnerstag, 10. Dezember 2020 um 07:40:33 UTC+1: > Tobias Knauss schrieb am Mittwoch, 9. Dezember 2020 um 22:33:33 UTC+1: > >> Stefan schrieb am Mittwoch, 9. Dezember 2020 um 20:04:11 UTC+1: >> >>> On Wednesday, December 9, 2020 at 5:10:04 PM UTC+1 Tobias Knauss wrote: >>> >>>> After a big merge, I am reviewing the merge result. Now I want to >>>> commit that part of the files that I have finished reviewing, so I >>>> selected >>>> 165 of 779 files/folders, see screenshot "tsvn-partial-commit-1". >>>> >>>> When trying to commit, I get the warning "Non-recursive commit of moved >>>> files/folders", see screenshot "tsvn-partial-commit-1-warning". The reason >>>> for this message was, that I had selected the root folder. Without it, the >>>> commit worked. >>>> >>>> But when I first aborted the commit and pressed F5 in the commit >>>> dialog, the number of files miraculously increased to 914, with many files >>>> twice or 3 times in the list now, see screenshot "tsvn-partial-commit-2". >>>> >>>> What is going wrong here? >>>> >>> >>> I can not reproduce that. What happens when you press F5 again? >>> Can you reproduce this or was this a fluke? >>> >> >>> >> *(previous message moved here from above to preserve the order in the > chat)* > > I was able to reproduce it multiple times. Since I committed only part > of the merge today, I think I should still be able to reproduce it again > tomorrow. > > If you cannot reproduct it yourself, you may watch my commit via > teamviewer if you like. (send me an email to knauss at schmoll-maschinen > dot de) > > Confirmed. I can reproduce easily on my current working copy. I can even > play that game multiple times in the same commit dialog. >
Today, I found situations in which the dialog "Non-recursive commit of moved files/folders" is falsely shown: Inside a working copy with many modified/added/deleted files, I select that part that I want to commit. This part is a self-contained group with no relations to files that I exclude from the commit. This is confirmed, because the commit starts, but then it's aborted by my pre-commit hook script. After editing the files that were rejected by my script (I opened them by double-click in the commit dialog), the next commit does not even start, but immediately shows the mentioned message, although the selection of files is identical. Side-effect: when pressing F5 key, the file numbers change from "226 selected, 589 total" to "226 selected, 226 total". Another appearance of the bug from above. However, after pressing F5, the commit can start again. And after the commit was rejected again, the whole precedure restarted. (226 of 589, Commit blocked, F5, 226 of 226, commit starts). Please note: I never clicked "proceed with the commit". -- 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/76bdb99e-4c5b-473b-a054-d0f48057fb16n%40googlegroups.com.
