Re: getting themes from cvs --> error.

[Martin Baulig <martin home-of-linux org>]

-----BEGIN PGP SIGNED MESSAGE-----

On Wed, 26 Aug 1998, Bertrand Guiheneuf wrote:

> To: gnome-list@gnome.org
> Subject: getting themes from cvs --> error.
> From: Bertrand Guiheneuf <Bertrand.Guiheneuf@inria.fr>
> 
> I am not a cvs super user, so what I do may be stupid but:
> 
> to try out gtk themes I did:
> cvs -z3 checkout gtk+
> then 
> cvs -z3 update -j themes-2 gtk+

What do you want to do with `-j themes-2' ?

I guess what you really wanted to do was a `-r themes-2' ...

> 
> but the gdk+/gdk/Makefile.am now is
> 
> --- cut here ---
> ## Process this file with automake to produce Makefile.in
> 
> gdkincludedir = $(includedir)/gdk
> 
> <<<<<<< Makefile.am
> lib_LTLIBRARIES = libgdk-1.1.la
> DEFS += -DG_LOG_DOMAIN=\"Gdk\"
> =======
> lib_LTLIBRARIES = libgdk.la
> DEFS += -DG_LOG_DOMAIN=\"Gdk\"
> >>>>>>> 1.18.2.1

This because merging from `themes-2' cause a conflict ...

> 
> etc ...
> --- cut here --
> and it does not compile.. ( complaining about those ====== )
> 
> So I guess all comes from my -j themes-2 instruction.
> Could someone tell me what I do wrong?
> 
> 
> Regards,
> 
> 	Bertrand 
> 
> =======================================================================
>   Bertrand GUIHENEUF           	E-Mail: bertrand.guiheneuf@inria.fr
>                                	Tel.:   (33) 01 39 63 50 36
>   				
>                     !!  Use GNU/LINUX OS  !!
> =======================================================================
> 
> 
> 
> -- 
>          To unsubscribe: mail gnome-list-request@gnome.org with 
>                        "unsubscribe" as the Subject.
> 

- -----------------------------------------------------------------
   Martin Baulig - Angewandte Mathematik - Universitaet Trier

   baulig@castor.uni-trier.de, http://www.home-of-linux.org/
   Key: 1024-bit key with ID C8178435 created 1997/01/24 
   ID:  67 C1 84 A0 47 F5 11 C5  5F 68 4C 84 99 05 C3 92
   Finger me for public key or fetch finger.txt from the url above
- ------------------------------------------------------------------


-----BEGIN PGP SIGNATURE-----
Version: 2.6.3i
Charset: noconv

iQCVAwUBNeQTh4A8K7jIF4Q1AQEDGgP/e0RJUkOCPyORHdA6FzaYyrxdmQ02Lm+L
Tu6MQCiWMU3PQu0lE8Q4E0MKoZbb6ApsVfVGxBMGRhMRVh4e/mJyXYx3F4xTZa4t
QGJmXa4GEJ68+VQ9tuNkh3yzx4psMTYBdqlPhN+vOwET2isfww5+LP9sVbdSWomU
oVVNd7uG7zo=
=HTnx
-----END PGP SIGNATURE-----