Subject: Re: Latest CVS won't build
From: Martin Sevior (msevior@mccubbin.ph.unimelb.edu.au)
Date: Fri Aug 25 2000 - 05:45:03 CDT
Hi Pierre,
yes this is a cvs
markup. What is means is that when doing an updat to your local directory
it couldn't workout how to merge in a changed file safely. The text is the
CVS sysmbol that something went wrong. The quick fix is to delte the
file(S) with the >>>> in them and do another cvs update. Then cvs will
download a new file file for everyone missing.
Good luck!
MArtin
On Fri, 25 Aug 2000,
Pierre Abbat wrote:
> I looked at the file and found the following:
>
> UT_Bool XAP_UnixApp::_loadFonts(void)
> {
> // create a font manager for our app to use
> <<<<<<< xap_UnixApp.cpp
> int RelativePathsSoFar,RelativePathCount;
> =======
> UT_uint32 relativePathsSoFar = 0, relativePathCount = 0;
>
> >>>>>>> 1.51
> m_fontManager = new XAP_UnixFontManager();
> UT_ASSERT(m_fontManager);
>
> Obviously this will cause the compiler to choke. Is this some CVS markup, and
> what does it mean?
>
> phma
>
>
This archive was generated by hypermail 2b25 : Fri Aug 25 2000 - 05:45:16 CDT