[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: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Fri, 10 Dec 2010 08:10:47 -0800

Hearing no objections, I'm going to mark this as DONE.

-Hyrum

On Wed, Dec 8, 2010 at 11:09 AM, Hyrum K. Wright
<hyrum_wright_at_mail.utexas.edu> 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?
>
> Thanks,
> -Hyrum
>
Received on 2010-12-10 17:11:25 CET

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