* [Buildroot] gnuconfig not up to date, but update gives conflicts during merge
@ 2007-07-09 4:16 Ulf Samuelsson
2007-07-09 18:22 ` Bernhard Fischer
0 siblings, 1 reply; 2+ messages in thread
From: Ulf Samuelsson @ 2007-07-09 4:16 UTC (permalink / raw)
To: buildroot
Checked if gnuconfig was up to date
Seems it was not, but cvs up was not clean.
What do we do?
? testsuite/.svn
cvs update: Updating .
P ChangeLog
RCS file: /cvsroot/config/config/config.guess,v
retrieving revision 1.349
retrieving revision 1.366
Merging differences between 1.349 and 1.366 into config.guess
M config.guess
RCS file: /cvsroot/config/config/config.sub,v
retrieving revision 1.340
retrieving revision 1.356
Merging differences between 1.340 and 1.356 into config.sub
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in config.sub
C config.sub
P uname
cvs update: Updating testsuite
P testsuite/config-guess.data
P testsuite/config-sub.data
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Buildroot] gnuconfig not up to date, but update gives conflicts during merge
2007-07-09 4:16 [Buildroot] gnuconfig not up to date, but update gives conflicts during merge Ulf Samuelsson
@ 2007-07-09 18:22 ` Bernhard Fischer
0 siblings, 0 replies; 2+ messages in thread
From: Bernhard Fischer @ 2007-07-09 18:22 UTC (permalink / raw)
To: buildroot
On Mon, Jul 09, 2007 at 06:16:48AM +0200, Ulf Samuelsson wrote:
>Checked if gnuconfig was up to date
>Seems it was not, but cvs up was not clean.
>What do we do?
We usually update if needed. This message leads me to think that you
require (or at least want) it to be updated. Well, try r19055
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-07-09 18:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-09 4:16 [Buildroot] gnuconfig not up to date, but update gives conflicts during merge Ulf Samuelsson
2007-07-09 18:22 ` Bernhard Fischer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox