configure broken?

[Oliver Sampson]

Howdy,
I just tried to update my CVS version and I get the following:

checking size of long long... ./configure: line 6355: syntax error
near unexpected token `<<<<<'
./configure: line 6355: `<<<<<<< configure'

Really, all is did was type 'cvs update' :-)

Thanks,
====================================================
Oliver Sampson                  
[e-mail]
http://www.oliversampson.com

[Marcus Meissner]

On Sat, Dec 15, 2001 at 01:02:35PM +0100, Oliver Sampson wrote:
> Howdy,
> I just tried to update my CVS version and I get the following:
>
> checking size of long long... ./configure: line 6355: syntax error
> near unexpected token `<<<<<'
> ./configure: line 6355: `<<<<<<< configure'
>
> Really, all is did was type 'cvs update' :-)

This is just a merge conflict. Either do
    rm configure ; cvs update configure
or just:
    autoconf
if you have autoconf installed.

Ciao, Marcus

[Oliver Sampson]

On Sat, 15 Dec 2001 14:35:28 +0100, Marcus Meissner
 wrote:
> On Sat, Dec 15, 2001 at 01:02:35PM +0100, Oliver Sampson wrote:
> > Howdy,
> > I just tried to update my CVS version and I get the following:
> >
> > checking size of long long... ./configure: line 6355: syntax error
> > near unexpected token `<<<<<'
> > ./configure: line 6355: `<<<<<<< configure'
> >
> > Really, all is did was type 'cvs update' :-)
>
> This is just a merge conflict. Either do
>    rm configure ; cvs update configure
> or just:
>    autoconf
> if you have autoconf installed.
>
> Ciao, Marcus

Thanks!   How does one know that it was this type of problem, as
opposed to another type of problem?

====================================================
Oliver Sampson                  
[e-mail]
http://www.oliversampson.com

[Dmitry Timoshkov]

"Oliver Sampson"  wrote:
> Thanks!   How does one know that it was this type of problem, as
> opposed to another type of problem?

Well, just solve that type of problem at least twice...

[Oliver Sampson]

On Sun, 16 Dec 2001 00:21:36 +0800, "Dmitry Timoshkov"
 wrote:
> "Oliver Sampson"  wrote:
> > Thanks!   How does one know that it was this type of problem, as
> > opposed to another type of problem?
>
> Well, just solve that type of problem at least twice...

Yep, I figgered that'd be the answer. :-)

Thanks,
====================================================
Oliver Sampson                  
[e-mail]
http://www.oliversampson.com

[David Elliott]

On 2001.12.15 14:35 Oliver Sampson wrote:
> On Sun, 16 Dec 2001 00:21:36 +0800, "Dmitry Timoshkov"
>  wrote:
> > "Oliver Sampson"  wrote:
> > > Thanks!   How does one know that it was this type of problem, as
> > > opposed to another type of problem?
> >
> > Well, just solve that type of problem at least twice...
>
> Yep, I figgered that'd be the answer. :-)

Actually, the <<<<<<< was a dead give away.  That generally indicates a 
conflict during the update.  You would have noticed that instead of an M 
or a P flag you got a C flag during the CVS update for that file.

You can use cvs diff -u, pipe it into less or gvim -R and '/^<<<' to look 
for these lines.

The real issue is that when you run autoconf on your computer it will more 
than likely generate a slightly different configure script than the 
autoconf Alexandre runs when he checks in changes to configure.in, etc.

Instead of rerunning autoconf (which may very well mean the next time you 
cvs update and there are changes to configure they may conflict) you could 
simply delete configure and do a cvs update -Pd which will redownload the 
file.

-Dave

[raddy]

Oliver Sampson wrote:
> On Sat, 15 Dec 2001 14:35:28 +0100, Marcus Meissner
>  wrote:
> > On Sat, Dec 15, 2001 at 01:02:35PM +0100, Oliver Sampson wrote:
> > > Howdy,
> > > I just tried to update my CVS version and I get the following:
> > >
> > > checking size of long long... ./configure: line 6355: syntax error
> > > near unexpected token `<<<<<'
> > > ./configure: line 6355: `<<<<<<< configure'
> > >
> > > Really, all is did was type 'cvs update' :-)
> >
> > This is just a merge conflict. Either do
> >    rm configure ; cvs update configure
> > or just:
> >    autoconf
> > if you have autoconf installed.
> >
> > Ciao, Marcus
>
> Thanks!   How does one know that it was this type of problem, as
> opposed to another type of problem?
>
> ====================================================
> Oliver Sampson                  
> [e-mail]
> http://www.oliversampson.com

hey, actually whenever cvs has merge conflicts between updates it leaves 
both version
differences in a file, leaving "--" lines explaining the differences, 
you could modify the file
 by hand and leave the line version you mostly like, since merging 
conflicts arent always
 -lethal- and they are quickly fixable.

and yep, the cvs -must- have said M conflict or either in wincvs a red M 
next to a "merging
 conflict" message.

i hope this helps, reading the cvs faq in wincvs.org might give you some 
hints on future cvs
 problems.

./rad

[Uwe Bonnes]

Oliver> Thanks!  How does one know that it was this type of problem, as
    Oliver> opposed to another type of problem?

Read the output of the cvs update and look for the word conflict.

Bye