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:
> At the risk of continuing this discussion even further, I think there
> is some misunderstanding about the nature of merge and conflict
> handling (in general, not just CVS). An empty line has no text,
> hence it cannot cause a conflict; only the same line in both files
> with different textual changes can cause a conflict. A deleted file,
> under some circumstances, can be considered to be a file with only
> empty lines.
The intriguing thing about this is that if you indeed do not delete the
file itself but just all lines within it and then merge it with a
non-empty revision from a branch, CVS *does* report a conflict. I just
tried it yesterday because this discussion sparked my interest....
Cheers,
--
Oliver
---- ------------------
JID: ogiesen at jabber.org
ICQ: 18777742
(http://wwp.icq.com/18777742)