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

Re: reintegrate and renames

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Wed, 20 Feb 2008 16:57:11 -0500

"Mark Phippard" <markphip_at_gmail.com> writes:
>> Now, these strategies will not lead to pure, unadulterated goodness.
>> Incoming merged changes still won't actually *follow* renames, so any
>> changes to /branch/bar will just 'skip' when reintegrated into /trunk.
>> It might be worth holding on to all the rename-tracebacks and printing
>> out (and/or storing) their results in some useful way on the client
>> side at the end of the merge, just so the user has somewhere to look
>> to figure out any manual cleanup that has to be done.
>
> I'd be careful about expanding the scope of this problem. The tree
> conflicts work has the opportunity to improve these problems. We know
> they are not easy to solve, I do not think now is the time to worry
> about this aspect of the problem.

+1

I merely meant to point out that the problem is there -- and propose
that we not worry about it right now. (The "record and display
tracebacks" feature is *not* for 1.5, I should have made that clear.)

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-20 23:01:12 CET

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