Den lör 13 jan. 2024 kl 10:16 skrev <dsahlb...@apache.org>: > Author: dsahlberg > Date: Sat Jan 13 09:16:26 2024 > New Revision: 1915215 > > URL: http://svn.apache.org/viewvc?rev=1915215&view=rev > Log: > Manage spurious Reverted message caused by non-W access to files > owned by another user. Part of Issue #4622. > > The revert notification comes from the code trying to add W permissions > but since there is already W (for another user) the code doesn't change > anything and the notification will come back next time as well. > > Changing to add a separate notification type "you don't have W access > and we can't do anything about it". > > The text should be tweaked further. >
... Modified: subversion/trunk/subversion/svn/notify.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1915215&r1=1915214&r2=1915215&view=diff ============================================================================== --- subversion/trunk/subversion/svn/notify.c (original) +++ subversion/trunk/subversion/svn/notify.c Sat Jan 13 09:16:26 2024 @@ -450,6 +450,11 @@ notify_body(struct notify_baton *nb, path_local)); break; + case svn_wc_notify_revert_noaccess: + SVN_ERR(svn_cmdline_printf(pool, _("User doesn't have WRITE permissions to file '%s' and the file isn't svn:needslock. But the file is already writeable. Probably owned by another user."), + path_local)); + break; + case svn_wc_notify_failed_revert: SVN_ERR(svn_cmdline_printf(pool, _("Failed to revert '%s' -- " "try updating instead.\n"), Modified: subversion/trunk/subversion/svnbench/notify.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/notify.c?rev=1915215&r1=1915214&r2=1915215&view=diff ============================================================================== --- subversion/trunk/subversion/svnbench/notify.c (original) +++ subversion/trunk/subversion/svnbench/notify.c Sat Jan 13 09:16:26 2024 @@ -241,6 +241,12 @@ notify(void *baton, const svn_wc_notify_ goto print_error; break; + case svn_wc_notify_revert_noaccess: + if ((err = svn_cmdline_printf(pool, _("User doesn't have WRITE permissions to file '%s' and the file isn't svn:needslock. But the file is already writeable. Probably owned by another user."), + path_local))) + goto print_error; + break; + case svn_wc_notify_failed_revert: if (( err = svn_cmdline_printf(pool, _("Failed to revert '%s' -- " "try updating instead.\n"), I would REALLY like someone to suggest a better wording for these messages. I couldn't come up with something simple that both explains what happend and suggests a reason. Kind regards, Daniel
