Re: [Gnumed-devel] Load Problem with cvs

[Karsten Hilbert]

> I'll try and fix this locally,
Yes.

> but something is astray in the cvs.
Not to my knowledge.

> File "gnumed.py", line 158, in ?
>     import gmGuiMain
>   File "gmGuiMain.py", line 43, in ?
>     import images_gnuMedGP_Toolbar                 #bitmaps for use on the 
> toolbar
>   File "<string>", line 168
>     <<<<<<< images_gnuMedGP_Toolbar.py
>      ^
> SyntaxError: invalid syntax
OK. The <<<<< is included (among other stuff) by the CVS
merging code whenever an automatic merge cannot finish
successfully due to conflicts.

What happened is this:

One version of image_gnuMedGP_Toolbar.py was in CVS. You
modified your local copy. Someone else modified the CVS()ed
copy. When you update()ed the cvs noticed that there is a
difference, tried to merge the two, noticed that there is a
conflict (because two people modified regions of the file that
were too close together), merged both versions into one marked
with above <<<<<<<<<<<<<< and deliberately broke the file so
that the user _must_ notice on the next compilation.

The solution is to manually inspect the file and merge the
appropriate bits into each other. This is, unfortunately, one
of the places where Python's choice of whitespace significance
can make things non-trivial as it may be rather hard to figure
out what level of indentation things belong to, especially if
people use spaces for indentation instead of tabs. It may be
necessary to unmerge and go back to the two original versions
and hand-merge.

Welcome to CVS.

Regards,
Karsten
-- 
GPG key ID E4071346 @ wwwkeys.pgp.net
E167 67FD A291 2BEA 73BD  4537 78B9 A9F9 E407 1346