Return-Path: 
 <commits-return-30764-apmail-subversion-commits-archive=subversion.apache.org@subversion.apache.org>
X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org
Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BD0B5C988
	for <apmail-subversion-commits-archive@minotaur.apache.org>;
 Tue,  2 Jul 2013 13:51:31 +0000 (UTC)
Received: (qmail 5555 invoked by uid 500); 2 Jul 2013 13:51:31 -0000
Delivered-To: apmail-subversion-commits-archive@subversion.apache.org
Received: (qmail 5535 invoked by uid 500); 2 Jul 2013 13:51:30 -0000
Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@subversion.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@subversion.apache.org>
List-Post: <mailto:commits@subversion.apache.org>
List-Id: <commits.subversion.apache.org>
Reply-To: dev@subversion.apache.org
Delivered-To: mailing list commits@subversion.apache.org
Received: (qmail 5517 invoked by uid 99); 2 Jul 2013 13:51:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 13:51:30 +0000
X-ASF-Spam-Status: No, hits=-0.7 required=5.0
	tests=RCVD_IN_DNSWL_LOW
X-Spam-Check-By: apache.org
Received-SPF: error (nike.apache.org: local policy)
Received: from [209.85.212.173] (HELO mail-wi0-f173.google.com)
 (209.85.212.173)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 13:51:24 +0000
Received: by mail-wi0-f173.google.com with SMTP id hq4so4214281wib.12
        for <commits@subversion.apache.org>;
 Tue, 02 Jul 2013 06:50:43 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=google.com; s=20120113;
        h=from:to:references:in-reply-to:subject:date:message-id:mime-version
         :content-type:content-transfer-encoding:x-mailer:thread-index
         :content-language:x-gm-message-state;
        bh=0aSiY6xP7pq94swg9l87MXJa/R8Cv+NmhiF6UVgEqVo=;
        b=OMRrk8cxxVUUe3P47x1/UwxsGjBySpOA4t7HtF5BZD+nsNJ0EBWrKQtxL22eKYi9Sm
         sAeD20iQrtrg8ymJL0zNHy3yDASWKaQaMrsR75+W9tfjY+DiEhohsmYEU7qoh4vHlAMQ
         SwGeVlmzaXi/+BCY30l87yQKdMeI9d/z4WEVdPEYVqydbRRsBOhhmhwW7hvpUuuWZVgH
         qddGO+VMiaycNMxZwoQEm+9HA5wHOmJmI5PH2mKE6mXth4cUFsv4ehjHV/m6/pl+nFdh
         2TWKx8Cw/V6MOkrAhZyApPodDL5nadn8ceZf+TBqWnETjJXntUjTxQhSteYdHVJu6keX
         8Bng==
X-Received: by 10.194.119.195 with SMTP id kw3mr23407854wjb.64.1372773043781;
        Tue, 02 Jul 2013 06:50:43 -0700 (PDT)
Received: from i72600 ([2001:610:66e:0:59f6:6194:a164:dbd7])
        by mx.google.com with ESMTPSA id h8sm23106364wie.1.2013.07.02.06.50.41
        for <multiple recipients>
        (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
        Tue, 02 Jul 2013 06:50:42 -0700 (PDT)
From: "Bert Huijben" <bert@qqmail.nl>
To: <dev@subversion.apache.org>,
	<commits@subversion.apache.org>
References: <20130702104022.BC7D22388860@eris.apache.org>
In-Reply-To: <20130702104022.BC7D22388860@eris.apache.org>
Subject: RE: svn commit: r1498873 - in /subversion/trunk/subversion:
 libsvn_wc/entries.c libsvn_wc/tree_conflicts.c libsvn_wc/tree_conflicts.h
 libsvn_wc/upgrade.c tests/libsvn_wc/conflict-data-test.c
Date: Tue, 2 Jul 2013 15:50:34 +0200
Message-ID: <02c301ce772b$213084d0$63918e70$@qqmail.nl>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Mailer: Microsoft Outlook 15.0
Thread-Index: AQLBgcl//671xiZ6WIBzWi+rzFIjvpdrUdlg
Content-Language: nl
X-Gm-Message-State: 
 ALoCoQkRcgcaEJaWhrlI4YyY2P4BA5HZynY0r9yzFBNcFycERKeYaTP9PlgEen+hjp6/2gvOkuiP
X-Virus-Checked: Checked by ClamAV on apache.org



> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: dinsdag 2 juli 2013 12:40
> To: commits@subversion.apache.org
> Subject: svn commit: r1498873 - in /subversion/trunk/subversion:
> libsvn_wc/entries.c libsvn_wc/tree_conflicts.c =
libsvn_wc/tree_conflicts.h
> libsvn_wc/upgrade.c tests/libsvn_wc/conflict-data-test.c
>=20
> Author: stsp
> Date: Tue Jul  2 10:40:22 2013
> New Revision: 1498873
>=20
> URL: http://svn.apache.org/r1498873
> Log:
> Make svn_wc__serialize_conflict() and svn_wc__deserialize_conflict() =
use
> the
> new conflict description structure (svn_wc_conflict_description3_t).

I'm not sure if this is really what we want here. If we move this =
forward with the new infrastructure we have to rev it every kind when we =
upgrade, while it is really only used for providing svn_wc_entry_t to =
1.6 style API uers, and for the upgrade from 1.6.

The serialization format here is locked to what we used then, and I =
don't know if our future in-memory-conflict data will be anything like a =
struct that can both be read and written.

If we have to keep the compatibility api anyway, we can just use it here =
and avoid revving all this in future versions.

	Bert