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

Philip Martin <philip@codematters.co.uk> writes:

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

Actually, the behavior you describe here is *not* a bug. There is a
difference between children of copied things showing '_' and showing
'A'.

I would expect the former to show up for "foo2/subdir" when I do:

   svn cp foo foo2 # where subdir is a versioned thing under foo

but the latter if I do:

   svn cp foo foo2 # where subdir is *not* existent in foo yet
   svn mkdir foo2/subdir # in this case, subdir is new to version history

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 8 21:40:25 2002