Details Ticket 915


Comment | Reply | Take | Open


Serial Number 915
Subject src/CMD/head/head.in
Area bug
Queue grass
Requestors Gordon.Haverland@gov.ab.ca
Owner none
Status resolved
Last User Contact Fri Feb 8 18:15:29 2002 (7 yr ago)
Current Priority 30
Final Priority 70
Due No date assigned
Last Action Fri Feb 8 20:06:16 2002 (7 yr ago)
Created Fri Feb 8 18:07:53 2002 (7 yr ago)

Transaction History Ticket 915


Fri, Feb 8 2002 18:07:53    Request created by guest  
Subject: src/CMD/head/head.in

Platform: Linux/Intel
Linux distro: Debian
linux cpu: Intel (i486, i586, pentium ...)
Xwindows version: Xfree 4.0.x
Xwindows manager: many
TclTk version: tcl/tk 8.3
grass downloaded at: CVS Server, Germany
grass binary for platform: I compiled the sources myself
grass sources source: yes, I am using the latest GRASS from CVS
c compiler name: gcc

After ./configure, I ran make.  And got zillions of errors about
a bad separator on line 55 of make.rules.  It seems that
src/CMD/head/head.in is the culprit.

<<<<<<< head.in
#LDFLAGS   = @STRIPFLAG@ @LDFLAGS@
LDFLAGS    = 
=======
LDFLAGS    = @LDFLAGS@
>>>>>>> 1.38

In the same directory is a file .#head.in.1.37, which has
#LDFLAGS   = @STRIPFLAG@ @LDFLAGS@
LDFLAGS    = @LDFLAGS@

I guess someone did an edit, and didn't quite save it properly.  :-)
I am trying a head.in file that is like the .#head.in.1.37
Fri, Feb 8 2002 18:15:29    Mail sent by glynn.clements@virgin.net  
Return-Path <glynn.clements@virgin.net>
Delivered-To grass-bugs@lists.intevation.de
From Glynn Clements <glynn.clements@virgin.net>
MIME-Version 1.0
Content-Type text/plain; charset=us-ascii
Content-Transfer-Encoding 7bit
Message-ID <15460.1735.963036.954008@cerise.nosuchdomain.co.uk>
Date Fri, 8 Feb 2002 17:11:35 +0000
To Request Tracker <grass-bugs@intevation.de>
Cc grass5@grass.itc.it
Subject Re: [GRASS5] [bug #915] (grass) src/CMD/head/head.in
In-Reply-To <20020208170753.8C92B139CA@lists.intevation.de>
References <20020208170753.8C92B139CA@lists.intevation.de>
X-Mailer VM 6.94 under 21.4 (patch 4) "Artificial Intelligence (candidate #1)" XEmacs Lucid
X-Spam-Status No, hits=0 required=5 tests=
Request Tracker wrote:

> Subject: src/CMD/head/head.in

> After ./configure, I ran make.  And got zillions of errors about
> a bad separator on line 55 of make.rules.  It seems that
> src/CMD/head/head.in is the culprit.
> 
> <<<<<<< head.in
> #LDFLAGS   = @STRIPFLAG@ @LDFLAGS@
> LDFLAGS    = 
> =======
> LDFLAGS    = @LDFLAGS@
> >>>>>>> 1.38

This is the result of a conflict when running "cvs update".

It occurs when you attempt to update a file which has been modified
locally, and the patch fails to apply to the local version.

The simplest fix is:

	rm src/CMD/head/head.in
	cvs update src/CMD/head/head.in

In general, whenever you run "cvs update", check the output for any
warnings or conflicts. Conflicts will generate a warning, and the
corresponding file will have the "C" status flag (files which are
updated successfully have "U" or "P").

-- 
Glynn Clements <glynn.clements@virgin.net>


Fri, Feb 8 2002 18:50:29    Mail sent by gordon.haverland@gov.ab.ca  
Return-Path <glynn.clements@virgin.net>
Delivered-To grass-bugs@lists.intevation.de
+0100 (CET)
(CET)
<20020208171515.MUIN5529.mta6-svc.virgin.net@cerise.nosuchdomain.co.uk>; Fri, 8 Feb 2002 17 15:15 +0000
From Glynn Clements <glynn.clements@virgin.net>
MIME-Version 1.0
Content-Type text/plain; charset=us-ascii
Content-Transfer-Encoding 7bit
Message-ID <15460.1735.963036.954008@cerise.nosuchdomain.co.uk>
Date Fri, 8 Feb 2002 17:11:35 +0000
To Request Tracker <grass-bugs@intevation.de>
Cc grass5@grass.itc.it
Subject Re: [GRASS5] [bug #915] (grass) src/CMD/head/head.in
In-Reply-To <20020208170753.8C92B139CA@lists.intevation.de>
References <20020208170753.8C92B139CA@lists.intevation.de>
X-Mailer VM 6.94 under 21.4 (patch 4) "Artificial Intelligence (candidate
#1)" XEmacs Lucid
X-Spam-Status No, hits=0 required=5 tests= -------------------------------------------- Managed by Request Tracker --- Headers Follow --- >From gordon.haverland@gov.ab.ca Fri Feb 8 18:50:18 2002
Return-Path <gordon.haverland@gov.ab.ca>
Delivered-To grass-bugs@lists.intevation.de
From gordon.haverland@gov.ab.ca
X-Lotus-FromDomain AAFRD
To Glynn Clements via RT <grass-bugs@intevation.de>
Message-ID <87256B5A.0061DC1B.00@agnotes_smtp01.agric.gov.ab.ca>
Date Fri, 8 Feb 2002 10:49:50 -0700
Subject Re: [bug #915] (grass) src/CMD/head/head.in
Mime-Version 1.0
Content-type text/plain; charset=us-ascii
Content-Disposition inline
X-Spam-Status No, hits=1 required=5 tests=NO_REAL_NAME
I guess I'll know better for next time.  I can't remember seeing any errors
when
I did the cvs update this morning, and I see no error files lying around.  I
guess
a person needs to run
   find . -name '.#*' -print
after doing a cvs update to reliably catch this?

Gord



|--------+-------------------------->
|        |          Glynn Clements  |
|        |          via RT          |
|        |          <grass-bugs@inte|
|        |          vation.de>      |
|        |                          |
|        |          02/08/2002 10:15|
|        |          AM              |
|        |          Please respond  |
|        |          to Glynn        |
|        |          Clements via RT |
|        |                          |
|--------+-------------------------->
  >--------------------------------------------------|
  |                                                  |
  |      To:     Gordon Haverland/AAFRD@AAFRD        |
  |      cc:                                         |
  |      Subject:     [bug #915] (grass)             |
  |       src/CMD/head/head.in                       |
  >--------------------------------------------------|





Request Tracker wrote:

> Subject: src/CMD/head/head.in

> After ./configure, I ran make.  And got zillions of errors about
> a bad separator on line 55 of make.rules.  It seems that
> src/CMD/head/head.in is the culprit.
>
> <<<<<<< head.in
> #LDFLAGS   = @STRIPFLAG@ @LDFLAGS@
> LDFLAGS    =
> =======
> LDFLAGS    = @LDFLAGS@
> >>>>>>> 1.38

This is the result of a conflict when running "cvs update".

It occurs when you attempt to update a file which has been modified
locally, and the patch fails to apply to the local version.

The simplest fix is:

           rm src/CMD/head/head.in
           cvs update src/CMD/head/head.in

In general, whenever you run "cvs update", check the output for any
warnings or conflicts. Conflicts will generate a warning, and the
corresponding file will have the "C" status flag (files which are
updated successfully have "U" or "P").

--
Glynn Clements <glynn.clements@virgin.net>


Fri, Feb 8 2002 20:06:16    Status changed to resolved by bernhard  
Comment | Reply | Take | Open

You are currently authenticated as guest.
[Show Configuration] [Login as another user]

Users Guide - Mail Commands - Homepage of RequestTracker 1.0.7 - list any request