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

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> I've fixed the test suite so that it detects the notification bug now.
> I'm running full "make check" to see if it uncovers any *more* bugs,
> besides the expected feedback bogosity stimulated by Branko's new test
> merge_test.py:add_with_history. Then I will try to fix Subversion, so
> that merging with history gives correct feedback too -- in other
> words, reducing the total number of bugs in head :-).

The feedback bug is that children in copied directories show up as
copied-with-history but status '_' not status 'A', is that correct?
This is the same behaviour as 'svn cp' is it a problem there as well?

>
> Brane, and possibly others, suggest that this fix may not be possible
> within the current framework, and that it may require first doing the
> Right Fix (i.e., the "big job" referred to above) to merge.
>
> I think they may be right. If investigation confirms this, it would
> be better for us to revert revision 2910 (the workaround), and move
> its development to a branch, until it fixes the original problem
> *without* introducing any new problems. So that's my plan.

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