Peter Samuelson wrote:
> > Yes, if the trunk changes get silently reverted, then this is really
> dangerous.
> >
> > But could the merge be smarter here? I mean, the last change on
> > branch-1/docs is at r99 (it was never changed in branch-1 since it is
> > sparse in the working copy).
>
> Well ... Subversion knows (or could know) that branch-1/docs has not
> been updated, but it does not know _why_. You assume that this is
> because whoever worked in branch-1 used a sparse checkout. But perhaps
> whoever merged from trunk r101-123 really did merge the docs/
> directory, but then looked at it and decided the changes were
> incorrect. So he reverted the whole directory before committing the
> merge.
Right, I can see this now. So there will always be a need for subtree
mergeinfo with sparse merges. But I hope it will be lot less annoying, if
(and when :) Paul manages to reduce it only to the really affected subtrees.
Kari.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1433928
Received on 2009-03-26 20:39:43 CET