On Thursday 15 February 2007 15:15, Phillip Susi wrote:
> Since a move in svn is just a copy+delete, renaming should have the
> same effect. I just checked this by renaming the trunk to branch
> instead of copying and it causes the same problem.
>
> It looks like this issue is not specific to branch/merge, but
> rather is a problem any time there is an add with history, and that
> add is committed in a revision other than the one immediately
> following the revision that the history is taken from. This leaves
> a hole with no history at all in between those two points. If
> there is history before, and after, then there should be something
> there during that interval showing that nothing was changed.
Phillip,
It looks like the problem is not specific to either of those, but to
you, misunderstanding what subversion needs to do.
from your example try
svn log -v repo/branch
and see if the "-v" helps you see in what way "repo/branch" exists in
rev1. I think you have something else to work out in your mind... why
the changes you want to merge would be -r1:4 and not -r3:4 if that
was the situation (I lose track).
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 16 00:21:41 2007