RE: .origin patch

[Cameron, Steve]

Derek Price writes:
> 
> Stephen Rasku wrote:
> 
> > Steve Cameron wrote:
> >
> > >Were the "spurious" conflicts coming from files which were
> > >deleted on the branch you were merging from,
> > >(which is what would I expect) or something else?
> >
> > There were no files that were deleted on the branch so that couldn't
> > be it.  The branch is actually a branch of a branch and I am merging
> > to the trunk.  

Ok, that explains it.  You're intentionally(?)
leaving out the changes that occurred on the 
branch and merging in only the changes made on the 
branch-of-a-branch when you use use 

        cvs update -j branch_of_a_branch.origin -j branch_of_a_branch

compared to

        cvs update -j branch_of_a_branch

which will pick up changes all the way back 
from a common ancestor on the trunk.  Presumably, those
extra changes are what caused the extra conflicts.

-- steve