[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] svn status to report tree conflict victims

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 22 Sep 2008 23:14:45 +0100

On Fri, 2008-09-19 at 18:33 +0200, Stefan Sperling wrote:
> On Fri, Sep 19, 2008 at 03:34:12PM +0100, Julian Foad wrote:
> > I don't want to bike-shed about this. I think the best thing to do here
> > is to go for a separate column, so that we're not hiding any
> > information. It will be easier to judge whether the extra information is
> > really useful if we can see it than if we hid it to start with.
>
> +1
>
> Let's try an extra column first.
> We can still change it if it turns out that we don't like it.

Of course that means we have to modify a whole bunch of existing tests
just to cope with having an extra column, before we start using it.

I'm doing that right now, in a separate commit. It will add a blank
column after the first six columns.

The log message is:
[[[
Add a blank column to the "svn status" output after the first six
columns, to make way for a tree-conflict status indication.

* subversion/svn/status.c
  (print_status): Print an extra blank.

* subversion/tests/cmdline/depth_tests.py,
  subversion/tests/cmdline/revert_tests.py,
  subversion/tests/cmdline/special_tests.py,
  subversion/tests/cmdline/stat_tests.py,
  subversion/tests/cmdline/svnadmin_tests.py
    Wherever a particular status output is expected: Expect an extra
blank.

* subversion/tests/cmdline/svntest/tree.py
  (build_tree_from_status): Expect an extra blank.

]]]

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-23 00:15:04 CEST

This is an archived mail posted to the Subversion Dev mailing list.