Philip Martin <philip@codematters.co.uk> writes:
> Philip Martin <philip@codematters.co.uk> writes:
>
> > cmpilato@collab.net writes:
> >
> > > Well, it appears I have to go off a freakin' tangent and fix
> > > merge/wc-access-baton bugs before the above actually happens.
> >
> > The absence of merge regression test coverage strikes again :-( I
> > tried a few merges by hand when I made the changes but that's unlikely
> > to cover everything. What fails?
>
> OK, I guess the problem you are seeing is when the merge deletes files
> from your wc. If you want a temporary work around, then first
> manually delete (and probably commit) the deletes that the merge is
> going to do, then the merge won't contain any deletes and the rest of
> it should work.
That's one of the problems, yes. I ran into a second one, too, but I
haven't quite wrapped up its identity just yet.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 20 20:55:48 2002