On May 19, 2011, at 9:25 AM, Bert Huijben wrote: > > >> -----Original Message----- >> From: Blair Zajac [mailto:bl...@orcaware.com] >> Sent: donderdag 19 mei 2011 18:18 >> To: cmpil...@apache.org >> Cc: Subversion Development >> Subject: Re: svn commit: r1124556 - >> /subversion/trunk/subversion/libsvn_wc/upgrade.c > > >>> --- subversion/trunk/subversion/libsvn_wc/upgrade.c (original) >>> +++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu May 19 >> 06:34:31 2011 >>> @@ -1273,9 +1273,10 @@ upgrade_to_wcng(void **dir_baton, >>> SVN_ERR(svn_io_check_path(logfile_path, &logfile_on_disk, >> scratch_pool)); >>> if (logfile_on_disk == svn_node_file) >>> return svn_error_create(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL, >>> - _("Cannot upgrade with existing logs; Use " >>> - "an 1.6 client to clean up before using " >>> - "this client")); >>> + _("Cannot upgrade with existing logs; run a > " >>> + "cleanup operation on this working copy > using " >>> + "a Subversion 1.6 client, then retry the > " >>> + "upgrade with the current client")); >> >> Out of curiosity, does it have to be a 1.6 client? What happens if its a > 1.5 or >> older client they are upgrading from? > > Then they can still fix it using their old version, *or* with a 1.6 client. > 1.6.X is the last version that can upgrade from those older versions of > logs.
In that case, the message needs to be updated. It would be confusing if somebody was on 1.5 and upgraded to 1.7, and got this message and thought, "what, I need to install 1.6?" Blair
