You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Blair Zajac <bl...@orcaware.com> on 2011/05/19 18:17:35 UTC
Re: svn commit: r1124556 - /subversion/trunk/subversion/libsvn_wc/upgrade.c
On May 18, 2011, at 11:34 PM, cmpilato@apache.org wrote:
> Author: cmpilato
> Date: Thu May 19 06:34:31 2011
> New Revision: 1124556
>
> URL: http://svn.apache.org/viewvc?rev=1124556&view=rev
> Log:
> Followup to r1124375.
>
> * subversion/libsvn_wc/upgrade.c
> (upgrade_to_wcng): Minor error message wording tweaks.
>
> Modified:
> subversion/trunk/subversion/libsvn_wc/upgrade.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1124556&r1=1124555&r2=1124556&view=diff
> ==============================================================================
> --- 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?
Blair
Re: svn commit: r1124556 - /subversion/trunk/subversion/libsvn_wc/upgrade.c
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 05/20/2011 01:05 AM, Blair Zajac wrote:
>
> On May 19, 2011, at 2:58 PM, C. Michael Pilato wrote:
>
>> On 05/19/2011 06:30 PM, Blair Zajac wrote:
>>> 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?"
>>
>> Is r1125138 better?
>
> Yes, thank you much :)
>
> BTW, you guys rock in Berlin. Why can't we have these events in the US?
It has been / is being discussed. :-)
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r1124556 - /subversion/trunk/subversion/libsvn_wc/upgrade.c
Posted by Blair Zajac <bl...@orcaware.com>.
On May 19, 2011, at 2:58 PM, C. Michael Pilato wrote:
> On 05/19/2011 06:30 PM, Blair Zajac wrote:
>> 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?"
>
> Is r1125138 better?
Yes, thank you much :)
BTW, you guys rock in Berlin. Why can't we have these events in the US?
Blair
Re: svn commit: r1124556 - /subversion/trunk/subversion/libsvn_wc/upgrade.c
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 05/19/2011 06:30 PM, Blair Zajac wrote:
> 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?"
Is r1125138 better?
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r1124556 - /subversion/trunk/subversion/libsvn_wc/upgrade.c
Posted by Blair Zajac <bl...@orcaware.com>.
On May 19, 2011, at 9:25 AM, Bert Huijben wrote:
>
>
>> -----Original Message-----
>> From: Blair Zajac [mailto:blair@orcaware.com]
>> Sent: donderdag 19 mei 2011 18:18
>> To: cmpilato@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
RE: svn commit: r1124556 - /subversion/trunk/subversion/libsvn_wc/upgrade.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Blair Zajac [mailto:blair@orcaware.com]
> Sent: donderdag 19 mei 2011 18:18
> To: cmpilato@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.
Bert
>
> Blair