You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Julian Foad <ju...@btopenworld.com> on 2003/07/25 21:43:47 UTC
Typo (or "braino") in update_tests.py
Log message:
[[[
Fix an inappropriate function name in update_tests.py.
This was fixed by kfogel within a large change committed as r6173,
but lost when that change was reverted in r6177.
* subversion/tests/clients/cmdline/update_tests.py
(update_to_resolve_text_conflicts): Replaces
update_to_revert_text_conflicts.
(test_list): Adjust.
]]]
- Julian
Re: Typo (or "braino") in update_tests.py
Posted by Julian Foad <ju...@btopenworld.com>.
cmpilato@collab.net wrote:
> Julian Foad <ju...@btopenworld.com> writes:
>
>>Fix an inappropriate function name in update_tests.py.
>>This was fixed by kfogel within a large change committed as r6173,
>>but lost when that change was reverted in r6177.
>>
>>* subversion/tests/clients/cmdline/update_tests.py
>> (update_to_resolve_text_conflicts): Replaces
>> update_to_revert_text_conflicts.
>
> Revision 6587 (though I feel this was a completely unnecessary change).
:-) Yes, I know. Sorry. It was pertinent when confusion between "revert" and "resolve" was under discussion.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Typo (or "braino") in update_tests.py
Posted by kf...@collab.net.
cmpilato@collab.net writes:
> This test uses neither 'revert' nor 'resolve'. It removes files and
> runs update. So while yes, the conflicts are "resolved", the
> conflicting text is also effectively "reverted". :-)
Oops, sorry -- I was relying on an obviously wrong memory of what that
test did.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Typo (or "braino") in update_tests.py
Posted by cm...@collab.net.
kfogel@collab.net writes:
> > Revision 6587 (though I feel this was a completely unnecessary change).
>
> You'd rather have test names that lie about what the test does? :-)
This test uses neither 'revert' nor 'resolve'. It removes files and
runs update. So while yes, the conflicts are "resolved", the
conflicting text is also effectively "reverted". :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Typo (or "braino") in update_tests.py
Posted by kf...@collab.net.
cmpilato@collab.net writes:
> Julian Foad <ju...@btopenworld.com> writes:
>
> > Log message:
> > [[[
> > Fix an inappropriate function name in update_tests.py.
> > This was fixed by kfogel within a large change committed as r6173,
> > but lost when that change was reverted in r6177.
> >
> > * subversion/tests/clients/cmdline/update_tests.py
> > (update_to_resolve_text_conflicts): Replaces
> > update_to_revert_text_conflicts.
> > (test_list): Adjust.
> > ]]]
>
> Revision 6587 (though I feel this was a completely unnecessary change).
You'd rather have test names that lie about what the test does? :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Typo (or "braino") in update_tests.py
Posted by cm...@collab.net.
Julian Foad <ju...@btopenworld.com> writes:
> Log message:
> [[[
> Fix an inappropriate function name in update_tests.py.
> This was fixed by kfogel within a large change committed as r6173,
> but lost when that change was reverted in r6177.
>
> * subversion/tests/clients/cmdline/update_tests.py
> (update_to_resolve_text_conflicts): Replaces
> update_to_revert_text_conflicts.
> (test_list): Adjust.
> ]]]
Revision 6587 (though I feel this was a completely unnecessary change).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org