Re: [PATCH] Issue 838 merge should copy-with-history

Branko ÄŒibej <brane@xbc.nu> writes:

> >Files are easy. Directories are harder, but I think I've worked out
> >how to do it without requiring significant libsvn_wc changes. I'll
> >put it into the issue.
> >
>
> Thanls, that would be great. I haven's spent much time thinking about
> that myself, yet.

OK, I've updated the issue.

> (Incidentally, Philip -- I assigned that issue back to you, now that
> I've committed your patch. Feel free to send it right back to me if
> you won't have time to work on it.)

Heh! The problem is that I have some 749 changes in my tree. These
broke when the 838 patch was applied, but I've since fixed it. If we
revert 838 then it will probably break again (hence my reaction to
Karl's proposal to revert 838!). However since I can't commit the 749
changes until the 838 position is resolved, I may just revert them and
work on 838 first.

Can someone tell me what the merge feedback should be when merge
copies-with-history a directory tree. I gather that Karl thinks it
should be different from that for copy.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org