Julian Foad <julianfoad_at_btopenworld.com> writes:
> Stefan Sperling wrote:
>
>> On Thu, Nov 29, 2012 at 04:52:15PM -0500, C. Michael Pilato wrote:
> [...]
>>> OWNERSHIP: Given Philip's comment, I believe it is reasonable to
>>> deem him the owner of this body of work, or at least co-owner with
>>> a possibly-time-constrained Stefan. But perhaps all there is to
>>> "own" is the post-branch removal of the feature?
>>
>> I'd prefer to get moves on trunk into a releasable state, or cut
>> the feature out on trunk and put it back in after branching 1.8.
>> I believe removing the feature would be somewhat invasive so it makes
>> sense to do so on trunk in several steps, rather than on the release
>> branch which is supposed to be stable at the time it is created.
>>
>> Obviously, fixing updates of moves would be even better :)
>> I hope Philip or someone else can find time for this.
>
> I'm going to try to help with this, this week and next week.
I still think we may get something working by the end of the year. The
simple cases will work and should be useful. The more complex cases
should also work to some extent, but it's possible that some subsequent
tree-conflicts that should be detected while resolving the first
tree-conflict may get missed.
I'm struggling with my wc-fu at the moment: all the code I write appears
to corrupt wc.db. I'm going to break up my patch into smaller bits.
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2012-12-03 21:33:00 CET