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

conflict resolver status update

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 28 Nov 2016 15:27:00 +0100

Just a short update on the new conflict resolver:

- The resolver now tries to detect nested moves.

- Merging incoming additions works.
  (updates produce text conflicts already without help from the resolver)

- Updating incoming moves is now implemented and needs testing.

- We have 28 conflict resolver tests, all of which PASS.

I have updated the wiki page about conflict tests accordingly:
https://wiki.apache.org/subversion/TreeConflictTests
The 28 tests we have do not cover much of the problem space.
There are 3 * 7 * 7 = 147 boxes on the page, and only 12 of them list tests.

I would be great if more people could help by writing a test or two to
fill an empty box. There are plenty of examples in the conflict-test.c
file by now. So this is not hard to do, it just takes time.
But we can't be sure whether the implementation is in good shape for
release without many more tests.

Apart from tests, there are other important points marked with [X] in:
https://svn.apache.org/repos/asf/subversion/trunk/notes/meetings/berlin-16-minutes
Among those, I believe are most important are:

 - Markup in test descriptions (for GUI clients). (Suggested by ivan)

 - A conflict walker API which makes it easier to third party clients to
   transition to the new conflict API. The walker we have in the 'svn'
   client is not trivial and we should avoid duplicating this code in
   every client. (Suggested by ivan)

I'll be working on all of the above, as time permits.

It would be nice to get trunk ready for release by January, but I'm not
sure yet how good test coverage will be by then.

Today on IRC, danielsh raised the question whether it was time for an
alpha-1 release. I think we could roll one this week, and hope to get
additional test coverage that way. However, in the past few people have
tested alphas so I believe adding more automated tests is more important.

Stefan
Received on 2016-11-28 15:27:12 CET

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