svn 1.14.1 merge issue "The Target has local modifications"

[Mike Jones]

Hello,  I believe I've encounter a new issue.   I just updated to tortoisesvn 1.14.2 / svn 1.14.1 last week (Windows 10 64bit).

Each time I attempt to merge between trunk and branch tortoisesvn displays a message:

"The target has local modifications.  The target working folder 'C:\myworkspace\branchname' has local modifications.  It is recommended to commit those changes first before merging new changes"

The problem is.. there are no pending changes.  Commit displays an empty list. Thinking the .svn database was corrupt,  I recursively removed ALL of my working folders and "checkout" again.  And still I get this warning.  This was working last week prior to upgrading.

I proceeded with the merge, committed, and it appears to have worked correctly.  I attempted a second merge after and still get this warning.

Ideas?  I searched for like reports but all seem to be around having the branches out of date.  In my case the branches are update(ed) and no pending changes.

Thanks

 -Mike

[Stefan]

thanks for the report.

Fixed in r29379

[Mike Jones]

Thank you.