What do you mean by "sand box"?
...Tony
---------------------- Forwarded by Anthony Fernandes/IPD on 02/22/2000
05:19 PM ---------------------------
"Cameron, Steve" <[EMAIL PROTECTED]> on 02/22/2000 03:41:49 PM
To: "'[EMAIL PROTECTED]'" <[EMAIL PROTECTED]>
cc:
Subject: RE: Unexpected conflicts in branche merges
David Martin wrote:
> Sankaranarayanan K V wrote:
>
> > I am trying to make the HEAD of a branch B1 the same as that of another
> > branch B2 by:
> >
> > cd <B1 sand box>
> > cvs update -j B1 -j B2
>
[smc] [...doubts about CVS supporting arbitrary merges snipped...]
>
> I would think that updating/merging branches which forked from the same
> base version might work. However, if the branches forked from different
> base versions, I would think there would be problems since a common
> ancestor would not necessarily be found.
[smc] When you specify two "-j" options, CVS does not try to find a
common ancestor. It merely computes the differences between
point A and point B in the form of a patch, and attempts to apply
that
patch.
In this case, point A is the tip of one branch, and purportedly also
the current up-to-date contents of the sandbox, and point B is the
tip of another branch. So CVS should compute the diffs between
A and B, and apply those diffs to the sandbox, which is supposed
to contain exactly A... so, reasonably one could expect the patch
to go through without a hitch (conflict) and produce a sandbox
with contents identical to B.
This is apparently not happenning in this instance, hence the
original question.
-- steve
