One must be carefull about the words one chooses here.... I did indeed use the term panick spelled with a ck loosley.
The files do show up completely different which was causing the developer to panick somewhat. As I recall the instructions for cygwin say to always install as unix line endings. I could be mistaken however. We installed cygwin to use ssh not cvs particulary, that is just something that came up later... mw- --- Larry Jones <[EMAIL PROTECTED]> wrote: > mike walster writes: > > > > The cygwin envinronments > > are installed with unix style the default for that system. > > That is the root of your problem. You should *NEVER* install cygwin > with Unix line endings -- if you want a Unix-like system, you know where > to find it. Having some of your tools use one line-ending convention > and others another is a sure recipe for insanity, catastrophe, or both. > > > We found > > that a file saved from a unix environment checked out with cywin and > > edited with gvim launched from windows then checked in with cygwin > > has screwed up line endings. This was causing merges to panick on a > > regular basis which was really ticking off one of our remote developers, > > What do you mean by "causing merges to panick"? I can see causing the > developer to panic since the entire file will be completely different > from CVS's perspective, but CVS shouldn't have a problem with it. > > -Larry Jones > > Just when I thought this junk was beginning to make sense. -- Calvin _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
