"non-recursive commit of moved/renamed folders"

Tobias Knauss

unread,

Dec 9, 2020, 11:10:04 AM12/9/20

to TortoiseSVN

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?

tsvn-partial-commit-2.png

tsvn-partial-commit-1.png

tsvn-partial-commit-1-warning.png

Tobias Knauss

unread,

Dec 9, 2020, 11:12:53 AM12/9/20

to TortoiseSVN

Again, I forgot to add the version info.

And, if you like, you could add ", and after F5, duplicate files in the commit dialog", which I forgot to add.

TortoiseSVN 1.14.99, Build 29032 - 64 Bit -dev, 2020/12/08 18:08:20
ipv6 enabled
Subversion 1.14.0, -release
apr 1.6.5
apr-util 1.6.1
serf 1.3.9
OpenSSL 1.1.1h 22 Sep 2020
zlib 1.2.11
SQLite 3.32.3

Stefan

unread,

Dec 9, 2020, 2:04:11 PM12/9/20

to TortoiseSVN

I can not reproduce that. What happens when you press F5 again?

Can you reproduce this or was this a fluke?

Tobias Knauss

unread,

Dec 9, 2020, 4:33:33 PM12/9/20

to TortoiseSVN

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)

Tobias Knauss

unread,

Dec 10, 2020, 1:40:33 AM12/10/20

to TortoiseSVN

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.

Tobias Knauss

unread,

Dec 10, 2020, 8:24:04 AM12/10/20

to TortoiseSVN

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".

Stefan

unread,

Dec 10, 2020, 1:16:14 PM12/10/20

to TortoiseSVN

On Thursday, December 10, 2020 at 2:24:04 PM UTC+1 Tobias Knauss wrote:

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

now this is the part that was missing: you have a pre-commit hook script that aborts the commit!

Stefan

unread,

Dec 10, 2020, 1:51:51 PM12/10/20

to TortoiseSVN

I assume that in the huge list of items you selected to open a commit dialog, there were one or two folders in it?

In that case, the folders have their status fetched recursively, and the files below as well. That's why you see those file entries several times.

I'll have to think on how to best resolve this...

Stefan

unread,

Dec 10, 2020, 2:24:40 PM12/10/20

to TortoiseSVN

should be fixed in r29037

Tobias Knauss

unread,

Dec 11, 2020, 7:24:34 AM12/11/20

to TortoiseSVN

Yes, but this pre-commit hook was not called in the first situations, because I never got this far that the commit was started (file upload never started).

So the warning "Non-recursive commit of moved files/folders" has nothing to do with the pre-commit hook script. This script was only relevant in the situation that I described in the post where the script is also mentioned.

Actually I described an issue in that post that may have a different cause; I just added it in this conversation because the resulting failure is very similar and seems to be related.

Stefan schrieb am Donnerstag, 10. Dezember 2020 um 19:51:51 UTC+1:

> I assume that in the huge list of items you selected to open a commit dialog, there were one or two folders in it?

> In that case, the folders have their status fetched recursively, and the files below as well. That's why you see those file entries several times.

Yes, there are folders, and not just one or two.

Stefan schrieb am Donnerstag, 10. Dezember 2020 um 20:24:40 UTC+1:

> should be fixed in r29037

No, failure persists. As mentioned above, it has nothing to do with the pre-commit script.

I think you just need to check whether the files, that are currently falsely added, are already in the list. If yes, don't add them again.

TortoiseSVN 1.14.99, Build 29037 - 64 Bit -dev, 2020/12/10 19:24:13

Stefan

unread,

Dec 11, 2020, 1:20:56 PM12/11/20

to TortoiseSVN

now that I could reproduce the problem: fixed in r29038

Tobias Knauss

unread,

Dec 14, 2020, 5:37:35 AM12/14/20

to TortoiseSVN

confirmed.

Reply all

Reply to author

Forward