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

Re: Conflict storage in 1.7

From: Branko ─îibej <brane_at_xbc.nu>
Date: Wed, 08 Dec 2010 22:25:18 +0100

On 08.12.2010 20:09, Hyrum K. Wright wrote:
> The current state of conflict storage is such that all conflict
> information is stored on the victim's node in the database. While the
> plan described in notes/wc-ng/conflict-storage is admirable, it
> requires much more work than just shuffling data bits around, and I'm
> hesitant to start in on it prior to branching 1.7. With that being
> said, I think that the current state of conflict storage is Good
> Enough for 1.7 (though could certainly be improved in the future).
> Does anybody have concerns about releasing the current format in 1.7?

Speaking as someone blissfully ignorant of the details ... apart from
having to indefinitely provide an upgrade path or compatibility layer
when the conflict storage changes, no. In other words, no worse than any
other backwards-incompatible change to the WC format, of which there
were quite a few.

Speaking strictly as an observer, I'd say that effort is better spent in
speeding up the working copy. Releasing 1.7 in a state where the WC is
slower than 1.6, even if only in corner cases, would be paper-bag time,
especially since one of the stated goals of the WC rewrite was to make
it much faster.

-- Brane
Received on 2010-12-08 22:26:02 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.