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 2008/09/25 16:34:07 UTC
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest
julianfoad@tigris.org wrote:
> Author: julianfoad
> Date: Wed Sep 24 23:32:16 2008
> New Revision: 33288
>
> Log:
> In "svn status", report tree conflict status on each victim individually.
> (For the time being, we still also report the parent as having tree-conflicted
> children.) In the test suite, adjust a test that looks at this status output
> directly. Provide support for this new status character to be tested using an
> attribute of StateItem, which will be the normal way to test it, but make the
> testing of this attribute optional and do not make any tests request it yet.
>
> * subversion/svn/status.c
> (print_status): Print "T" in the tree status column if this is a tree
> conflict victim.
How about printing a "C" in that column instead. I think people are pretty used
to seeing a "C" to mean conflict. And "T" can appear in the sixth lock column
which will make it harder to distinguish if I have a tree conflict or a stolen
lock without counting columns.
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Bikeshed: "T" or "C" for tree conflict status [Re: svn commit:
r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest]
Posted by "C. Michael Pilato" <cm...@collab.net>.
Blair Zajac wrote:
> Julian Foad wrote:
>> On Thu, 2008-09-25 at 09:34 -0700, Blair Zajac wrote:
>>> How about printing a "C" in that column instead. I think people are
>>> pretty used to seeing a "C" to mean conflict. And "T" can appear in
>>> the sixth lock column which will make it harder to distinguish if I
>>> have a tree conflict or a stolen lock without counting columns.
>>
>> How about it? Sure, it's a fair option. It might well be better.
>> Suggestion noted, and I think I agree. I'll be happy to change it when
>> there's a consensus. Until then it's a bike-shed that requires changes
>> in a few places in the test suite and a test-build each time we change
>> it, so I'll avoid hasty action.
>
> OK. Changing the subject to make this thread more visible. Anytime
> there's bikeshed in the title, I'm sure we'll get lots of feedback. :)
I refuse to respond to yet another bikeshed thread.
Oh. Shoot.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Bikeshed: "T" or "C" for tree conflict status [Re: svn commit: r33288
- in trunk/subversion: svn tests/cmdline tests/cmdline/svntest]
Posted by Blair Zajac <bl...@orcaware.com>.
Julian Foad wrote:
> On Thu, 2008-09-25 at 09:34 -0700, Blair Zajac wrote:
>> julianfoad@tigris.org wrote:
>>> Author: julianfoad
>>> Date: Wed Sep 24 23:32:16 2008
>>> New Revision: 33288
>>>
>>> Log:
>>> In "svn status", report tree conflict status on each victim individually.
>>> (For the time being, we still also report the parent as having tree-conflicted
>>> children.) In the test suite, adjust a test that looks at this status output
>>> directly. Provide support for this new status character to be tested using an
>>> attribute of StateItem, which will be the normal way to test it, but make the
>>> testing of this attribute optional and do not make any tests request it yet.
>>>
>>> * subversion/svn/status.c
>>> (print_status): Print "T" in the tree status column if this is a tree
>>> conflict victim.
>> How about printing a "C" in that column instead. I think people are pretty used
>> to seeing a "C" to mean conflict. And "T" can appear in the sixth lock column
>> which will make it harder to distinguish if I have a tree conflict or a stolen
>> lock without counting columns.
>
> How about it? Sure, it's a fair option. It might well be better.
> Suggestion noted, and I think I agree. I'll be happy to change it when
> there's a consensus. Until then it's a bike-shed that requires changes
> in a few places in the test suite and a test-build each time we change
> it, so I'll avoid hasty action.
OK. Changing the subject to make this thread more visible. Anytime there's
bikeshed in the title, I'm sure we'll get lots of feedback. :)
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest
Posted by Bert Huijben <b....@competence.biz>.
> -----Original Message-----
> From: C. Michael Pilato [mailto:cmpilato@collab.net]
> Sent: vrijdag 26 september 2008 15:22
> To: Blair Zajac
> Cc: Greg Stein; dev@subversion.tigris.org; julianfoad@tigris.org
> Subject: Re: svn commit: r33288 - in trunk/subversion: svn
> tests/cmdline tests/cmdline/svntest
>
> Blair Zajac wrote:
> > It sounds like the only two people who said anything about it agreed
> on
> > the change but we're waiting for feedback. So maybe after N days
> with
> > no feedback the change is made?
> >
> > Anyway, this bikeshed is very easy, what character do you want in the
> > 'svn status' output for a new column for a tree conflict?
>
> If it's truly that simple, then "C" is my answer. We've got "C" for
> text
> conflicts, "C" for prop conflicts, and so "C" from tree conflicts seems
> reasonable. The only other letter that comes to mind is "T" (for
> "Tree"),
> but "tree" is just a modifier here -- "conflict" is the noun we care to
> report on. (Plus, we already use "T" for sTolen locks.)
+1 on the 'C' (bikeshed).
I think current users will understand that it is some kind of conflict without reading the manual.
Bert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline
tests/cmdline/svntest
Posted by Julian Foad <ju...@btopenworld.com>.
On Fri, 2008-09-26 at 09:22 -0400, C. Michael Pilato wrote:
> Blair Zajac wrote:
> > It sounds like the only two people who said anything about it agreed on
> > the change but we're waiting for feedback. So maybe after N days with
> > no feedback the change is made?
> >
> > Anyway, this bikeshed is very easy, what character do you want in the
> > 'svn status' output for a new column for a tree conflict?
>
> If it's truly that simple, then "C" is my answer. We've got "C" for text
> conflicts, "C" for prop conflicts, and so "C" from tree conflicts seems
> reasonable. The only other letter that comes to mind is "T" (for "Tree"),
> but "tree" is just a modifier here -- "conflict" is the noun we care to
> report on. (Plus, we already use "T" for sTolen locks.)
OK, consensus achieved. Committed revision 33310.
Thanks for the feedback.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest
Posted by "C. Michael Pilato" <cm...@collab.net>.
Blair Zajac wrote:
> It sounds like the only two people who said anything about it agreed on
> the change but we're waiting for feedback. So maybe after N days with
> no feedback the change is made?
>
> Anyway, this bikeshed is very easy, what character do you want in the
> 'svn status' output for a new column for a tree conflict?
If it's truly that simple, then "C" is my answer. We've got "C" for text
conflicts, "C" for prop conflicts, and so "C" from tree conflicts seems
reasonable. The only other letter that comes to mind is "T" (for "Tree"),
but "tree" is just a modifier here -- "conflict" is the noun we care to
report on. (Plus, we already use "T" for sTolen locks.)
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest
Posted by Blair Zajac <bl...@orcaware.com>.
It sounds like the only two people who said anything about it agreed on the
change but we're waiting for feedback. So maybe after N days with no feedback
the change is made?
Anyway, this bikeshed is very easy, what character do you want in the 'svn
status' output for a new column for a tree conflict?
Blair
Greg Stein wrote:
> Yup... it *is* a bikeshed, but there does need to be a way to resolve
> it. So a random throw at "consensus" might not do it. Maybe something
> a little more proactive? I'm coming from the peanut gallery, so I
> don't really know the options. I'd love to provide some input (heh,
> "bikeshed input"), but it is unclear what is really going on here. I
> would guess that some others are similarly unaware. Kinda the nature
> where/how people pay attention.
>
> Thanks,
> -g
>
> On Thu, Sep 25, 2008 at 10:10 AM, Julian Foad
> <ju...@btopenworld.com> wrote:
>> On Thu, 2008-09-25 at 09:34 -0700, Blair Zajac wrote:
>>> julianfoad@tigris.org wrote:
>>>> Author: julianfoad
>>>> Date: Wed Sep 24 23:32:16 2008
>>>> New Revision: 33288
>>>>
>>>> Log:
>>>> In "svn status", report tree conflict status on each victim individually.
>>>> (For the time being, we still also report the parent as having tree-conflicted
>>>> children.) In the test suite, adjust a test that looks at this status output
>>>> directly. Provide support for this new status character to be tested using an
>>>> attribute of StateItem, which will be the normal way to test it, but make the
>>>> testing of this attribute optional and do not make any tests request it yet.
>>>>
>>>> * subversion/svn/status.c
>>>> (print_status): Print "T" in the tree status column if this is a tree
>>>> conflict victim.
>>> How about printing a "C" in that column instead. I think people are pretty used
>>> to seeing a "C" to mean conflict. And "T" can appear in the sixth lock column
>>> which will make it harder to distinguish if I have a tree conflict or a stolen
>>> lock without counting columns.
>> How about it? Sure, it's a fair option. It might well be better.
>> Suggestion noted, and I think I agree. I'll be happy to change it when
>> there's a consensus. Until then it's a bike-shed that requires changes
>> in a few places in the test suite and a test-build each time we change
>> it, so I'll avoid hasty action.
>>
>> Thanks.
>> - Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest
Posted by Greg Stein <gs...@gmail.com>.
Yup... it *is* a bikeshed, but there does need to be a way to resolve
it. So a random throw at "consensus" might not do it. Maybe something
a little more proactive? I'm coming from the peanut gallery, so I
don't really know the options. I'd love to provide some input (heh,
"bikeshed input"), but it is unclear what is really going on here. I
would guess that some others are similarly unaware. Kinda the nature
where/how people pay attention.
Thanks,
-g
On Thu, Sep 25, 2008 at 10:10 AM, Julian Foad
<ju...@btopenworld.com> wrote:
> On Thu, 2008-09-25 at 09:34 -0700, Blair Zajac wrote:
>> julianfoad@tigris.org wrote:
>> > Author: julianfoad
>> > Date: Wed Sep 24 23:32:16 2008
>> > New Revision: 33288
>> >
>> > Log:
>> > In "svn status", report tree conflict status on each victim individually.
>> > (For the time being, we still also report the parent as having tree-conflicted
>> > children.) In the test suite, adjust a test that looks at this status output
>> > directly. Provide support for this new status character to be tested using an
>> > attribute of StateItem, which will be the normal way to test it, but make the
>> > testing of this attribute optional and do not make any tests request it yet.
>> >
>> > * subversion/svn/status.c
>> > (print_status): Print "T" in the tree status column if this is a tree
>> > conflict victim.
>>
>> How about printing a "C" in that column instead. I think people are pretty used
>> to seeing a "C" to mean conflict. And "T" can appear in the sixth lock column
>> which will make it harder to distinguish if I have a tree conflict or a stolen
>> lock without counting columns.
>
> How about it? Sure, it's a fair option. It might well be better.
> Suggestion noted, and I think I agree. I'll be happy to change it when
> there's a consensus. Until then it's a bike-shed that requires changes
> in a few places in the test suite and a test-build each time we change
> it, so I'll avoid hasty action.
>
> Thanks.
> - Julian
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest
Posted by "Neels J. Hofmeyr" <ne...@elego.de>.
Julian Foad wrote:
> On Thu, 2008-09-25 at 09:34 -0700, Blair Zajac wrote:
>> julianfoad@tigris.org wrote:
>>> Author: julianfoad
>>> Date: Wed Sep 24 23:32:16 2008
>>> New Revision: 33288
>>>
>>> Log:
>>> In "svn status", report tree conflict status on each victim individually.
>>> (For the time being, we still also report the parent as having tree-conflicted
>>> children.) In the test suite, adjust a test that looks at this status output
>>> directly. Provide support for this new status character to be tested using an
>>> attribute of StateItem, which will be the normal way to test it, but make the
>>> testing of this attribute optional and do not make any tests request it yet.
>>>
>>> * subversion/svn/status.c
>>> (print_status): Print "T" in the tree status column if this is a tree
>>> conflict victim.
>> How about printing a "C" in that column instead. I think people are pretty used
>> to seeing a "C" to mean conflict. And "T" can appear in the sixth lock column
>> which will make it harder to distinguish if I have a tree conflict or a stolen
>> lock without counting columns.
>
> How about it? Sure, it's a fair option. It might well be better.
> Suggestion noted, and I think I agree. I'll be happy to change it when
> there's a consensus. Until then it's a bike-shed that requires changes
> in a few places in the test suite and a test-build each time we change
> it, so I'll avoid hasty action.
+1
--
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Re: svn commit: r33288 - in trunk/subversion: svn tests/cmdline
tests/cmdline/svntest
Posted by Julian Foad <ju...@btopenworld.com>.
On Thu, 2008-09-25 at 09:34 -0700, Blair Zajac wrote:
> julianfoad@tigris.org wrote:
> > Author: julianfoad
> > Date: Wed Sep 24 23:32:16 2008
> > New Revision: 33288
> >
> > Log:
> > In "svn status", report tree conflict status on each victim individually.
> > (For the time being, we still also report the parent as having tree-conflicted
> > children.) In the test suite, adjust a test that looks at this status output
> > directly. Provide support for this new status character to be tested using an
> > attribute of StateItem, which will be the normal way to test it, but make the
> > testing of this attribute optional and do not make any tests request it yet.
> >
> > * subversion/svn/status.c
> > (print_status): Print "T" in the tree status column if this is a tree
> > conflict victim.
>
> How about printing a "C" in that column instead. I think people are pretty used
> to seeing a "C" to mean conflict. And "T" can appear in the sixth lock column
> which will make it harder to distinguish if I have a tree conflict or a stolen
> lock without counting columns.
How about it? Sure, it's a fair option. It might well be better.
Suggestion noted, and I think I agree. I'll be happy to change it when
there's a consensus. Until then it's a bike-shed that requires changes
in a few places in the test suite and a test-build each time we change
it, so I'll avoid hasty action.
Thanks.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org