On Fri, Mar 12, 2010 at 6:53 PM, Manny DaSilva <manny...@yahoo.com> wrote: > I read article in detail: > http://www.collab.net/community/subversion/articles/merge-info.html > and now I think I know why the X/A mergeinfo has asterisk > (/trunk/A:199-202*). Folder X/A has additional sub-folders, other > than 1,2,3 and those sub-folders, for example X/A/4, are not > available in the sparse working copy. OK, this makes sense. > > I tried a new test. I used a fresh copy of trunk as > branches/Z and just used the command-line. I followed the steps > outlined in the article section "Mergeinfo Inheritance and > Non-Inheritable Ranges". > > The results are the same as before. As described in my first post, > the reintegrate simply will not work .
It seems reintegrate indeed doesn't cope well with non-inheritable mergeinfo, as you describe (non-inheritable mergeinfo by itself is not really a problem, as long as you don't reintegrate (like with a release branch or something like that)). I can't judge whether this problem is a bug, or expected/intended behavior. Maybe someone else can comment? Just one more thought: if you build a sparse working copy of trunk that is sparse in the same way as the branch working copy (in which you merged), would you be able to reintegrate into that? Johan
