RE: help, doing a CVS import messed up my working dir!?!?!

[Dave Korn]

----Original Message----
>From: Mark D. Baushke
>Sent: 22 August 2005 18:01

> Dave Korn writes:

> All of the conflicts are a result of your commits to the mainline of
> changes to previously imported KERNEL_ORG files.

  We're just having a slight semantic disagreement here; to me, a conflict
is what happens when you try to apply a delta to something that already has
a (non-identical) delta in the same region, and it doesn't make sense to
talk about a conflict between files on separate branches; I thought I had
1.1 on mainline, and applied a delta that made it 1.2, and I thought I had
1.1.1.1 on the vendor branch, and was (by doing the import) effectively
applying a delta to get 1.1.1.2, and I didn't see how there could be a
conflict, since both of them were clean deltas to the original source file
and I never asked it to apply both deltas to the same file!

  And to tell the truth, that's all just a matter of wording, but what I
still don't understand is this:  when cvs complained about a conflict, was
that because it was applying the 1.1.1.1->1.1.1.2 delta to something that
already contained 1.1->1.2, or was that because it was applying the 1.1->1.2
delta to something that already contained 1.1.1.1->1.1.1.2?

> Well, now you know.

  Yes indeed.  Thanks for your comprehensive advice!

    cheers,
      DaveK
-- 
Can't think of a witty .sigline today....