Greg Stein wrote:
> I need the token mappings in upgrade.c and wc_db.c in order to
> populate the CONFLICT_VICTIM table.
>
> There are some functions in upgrade.c to do the mapping, but the
> values are slightly "off". I see no reason for differentiating the
> values from what we store in the skels, so I want to use the existing
> value mappings. Further, that skel storage/format will move to
> old-and-busted.c. It is quite probable that tree_conflicts.[ch] will
> go away entirely.
Oh yes, OK.
- Julian
> Cheers,
> -g
>
> On Mon, Sep 14, 2009 at 10:05, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> > Later, in r39282 you made the tree conflict description tokens
> > semi-public:
[...]
> > I think we should revert that part of that change, [...]
> >
> > Would that be OK (patch attached) or did you have a different reason in
> > mind?
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2395084
Received on 2009-09-15 15:45:47 CEST