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

Re: Tree-conflicts branch - log message / review

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 03 Sep 2008 00:08:16 +0100

On Tue, 2008-09-02 at 16:03 -0500, Hyrum K. Wright wrote:
> Julian Foad wrote:
> > Hi, tree conflicts fans.
> >
> > I have written a complete log message of what is on the tree-conflicts
> > branch compared with trunk. This is attached and also stored in
> > README.branch in the root of the branch.
> >
> > The diff is available for a while at
> > <http://filebin.ca/ajqeez/tc-r32853.patch>.
> >
> > Updates to the branch since last time include: resolve a bunch of
> > non-essential differences such as changes that were better made on the
> > trunk; catch up with recent changes from trunk; Neels' work on improving
> > the tests.
> >
> > Anyone able to pick a small part of it to review, or help with, or just
> > ping me about, is very welcome.
>
> I haven't reviewed the branch, but I was wondering what the time table for
> merging back to trunk is. I feel that the sooner we can get it to trunk, the
> better, just from a testing/review perspective.

Yes, exactly. The timetable is "yesterday of last month", or something
like that.

Seriously, I'm trying to do stuff to help make it mergeable: both in
terms of coding, but more particularly in terms of making it reviewable
and digestible. This log message is a part of that.

The most helpful thing I/we can produce right now is, I think, a summary
of what behaviours the branch improves vs. where it fails, so that we
can see at a glance if there are any regressions and how much fixing is
required to make it a definite win for putting on trunk.

I think that's the only thing needed before merging to trunk. (I also
need to check how much it meets its goals, but that is not holding it
off the trunk.)

If you (anyone) can help evaluate it - perhaps by running the tests and
looking at the verbose output - I'd very much appreciate it.

Tests (on the branch) that are directly testing tree conflicts:
  libsvn_wc/tree-conflict-data-test.c
  cmdline/info_tests.py 1
  cmdline/update_tests.py 46 47 48 49 50
  cmdline/switch_tests.py 31 32 33 34 35
  cmdline/merge_tests.py 107 108 109 110 111 112 113 114 115 116
  cmdline/tree_conflict_tests.py # 1 through 16

Tests (on the branch) that are failing for related reasons:
  cmdline/checkout_tests.py 13
  cmdline/update_tests.py 14 15 31 33 34
  cmdline/switch_tests.py 21 24
  cmdline/merge_tests.py 19 20 39 68 106

Thanks,
- 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-03 01:08:55 CEST

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