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

Re: [RFC] An element-based 'svn merge'

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 18 Dec 2015 13:49:08 +0000

Julian Foad <julianfoad_at_apache.org> writes:

> I (Julian Foad) wrote:
>
>> 4. Conversion of the element-based result to a series of WC edits. The
>> code in branch_compat.c doesn't quite do this, as it assumes an Ev1
>> output (with only a 'copy' operation) whereas the WC API has a 'move'
>> operation that we probably need to use. In general it will need to
>> insert temporary moves e.g. to swap X and Y it may need to start by
>> moving X to temporary name Z. Unless the WC API moves can also be set
>> up using just 'copy' operations, in which case the approach in
>> branch_compat.c is on the right track although it is currently buggy.
>
> Anyone willing to help write one of the other parts?

I'll start looking at 4.

-- 
Philip Martin
WANdisco
Received on 2015-12-18 14:49:22 CET

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