Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
John Peacock wrote:
> I did say "under some circumstances" didn't I? In this case, I
> believe it is because in order to apply a patch, some anchor line
> must be found in order to begin applying the diff lines. An empty
> file has no text, hence no anchor, hence you cannot patch it.
>
> What I was trying to get at was that a conflict is based on "changed
> line text" and a deleted line cannot be in conflict. A deleted file
> has only deleted lines, hence will not throw a conflict. An empty
> file causes a conflict for the reason I listed above.
I just might be a little bit thick... I did not /create/ the file
empty... here's what I did:
1. I created a file on the trunk and committed it (with some dummy
contents).
2. I created a branch off that intitial revision and also commited some
more modifications on that branch.
3. I went back the trunk revision, deleted all lines from it and
committed it. As far I understood you, you are saying that this is
pretty much the same as cvs removing the file.
4. I merged the now empty trunk-file with the still filled branch file
and got a conflict.
I must admit that I haven't tested the counter-case, where at step 3 I
really cvs remove the file, but as far as I understood Mike, there will
be no conflict in that case, which would prove wrong your statement
that cvs removing a file is equivalent to deleting all lines from it.
I misunderstood you, didn't I?
Cheers,
--
Oliver
---- ------------------
JID: ogiesen at jabber.org
ICQ: 18777742
(http://wwp.icq.com/18777742)