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

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

> >Negative, should be the same. And both need to be fixed, it seems!
> >And I wonder that one tweak to repos_diff.c would do the trick...
> >
> No. It would fix the merge and cp bug, but would introduce a bug in
> add (on a directory).
>
>
> Hmmmmm. Lemme see if I can make that bit conditional.

I don't understand (Again! Why is feedback so hard?) How does
repos_diff.c affect adding directories? Are you referring to a merge
that adds a directory, with the working copy already having a
versioned directory of that name? In that case merge does nothing for
the directory unless it is scheduled for deletion. What should the
feedback be in that case? Why are directories a problem and not
files?

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