Re: reintegrate and renames

On Sat, Apr 5, 2008 at 2:13 PM, David Glasser <glasser_at_davidglasser.net> wrote:
> On Sat, Apr 5, 2008 at 8:33 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> > On Fri, Apr 4, 2008 at 11:01 PM, David Glasser <glasser_at_davidglasser.net> wrote:
> > I guess I am just proposing we wait until we know the entirety of the
> > problem in real situations. The user has a relatively easy "out" in
> > the current code (namely they can run the 2-URL merge and get the
> > identical results. We can optimize this for 1.6 if we see the need,
> > or we can even do it before RC2 if after you look at the problem
> > deeper you become more convinced it is the right thing to do now.
>
> Well, take a peek at one of the XFailing reintegrate tests and see how
> unreasonable it is...

I am not doubting how easy it is to create the scenario. I still have
two thoughts:

1) Maybe we should be trying to attack the problem at the point where
we create it. In other words, be smarter about when we create the
mergeinfo that causes the problem.

2) Merges with renames basically do not work anyway. So maybe people
just avoid renames? I doubt that is the case. But this issue is just
a minor part of the larger problem.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org