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

Philip Martin <philip@codematters.co.uk> writes:
> 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.

Huh? No, I just think that spurious spaces shouldn't be inserted into
the output :-). Whether just merge is doing it, or both merge and
copy, it's still broken. It may have been broken before, and we just
noticed it now.

> 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.

Karl's position is now identical to Brane's and yours: let's not
revert it. Y'all persuaded me :-).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 8 23:01:28 2002