Re: .origin patch

[Derek R. Price]

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.  I don't know if that enlightens you or not.  I think
> maybe some changes were made on the branch but not on the sub-branch
> and these were migrated during the merge.
>
> If I get a chance to look at this again, I will give you more details.

I haven't messed with it in awhile, I believe that when merging with a
single -j option, CVS merges from the common ancestor of the destination
revision and the revision specified by -j, so that probably explains the
behavior you saw.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:dprice@collab.net         CollabNet ( http://collab.net )
--
OK, who stopped payment on my reality check?