On Wed, 2009-09-02 at 22:32 +0300, Abdulaziz Ghuloum wrote:
> On Sep 2, 2009, at 10:26 PM, Eduardo Cavazos wrote:
>
> > Just curious, how do y'all avoid these conflicts?
>
> I'm curious if anybody else gets these because you're not supposed to
> get these conflicts unless you're modifying these files yourself
> (e.g., by running automake/autoconf).
I'd never got these conflicts before, but I just got the same as Eduardo
when I updated:
[...@eep:~/ikarus.dev]-> bzr update
M .bzrignore
M Makefile.in
M aclocal.m4
M benchmarks/Makefile.in
M c32
M c64
M config.h.in
M configure
M configure.ac
M doc/Makefile.in
M lib/Makefile.in
M scheme/Makefile.in
M scheme/ikarus.io.ss
M scheme/last-revision
M scheme/makefile.ss
M src/Makefile.in
M src/ikarus-process.c
Text conflict in benchmarks/Makefile.in
Text conflict in doc/Makefile.in
Text conflict in lib/Makefile.in
Text conflict in scheme/Makefile.in
Text conflict in src/Makefile.in
5 conflicts encountered.
Updated to revision 1854.
[...@eep:~/ikarus.dev]->
So I tried:
[...@eep:/tmp]-> bzr checkout --lightweight -r 1851
http://ikarus-scheme.org/ikarus.dev
[...@eep:/tmp]-> cd ikarus.dev
[...@eep:/tmp/ikarus.dev]-> bzr status
working tree is out of date, run 'bzr update'
[...@eep:/tmp/ikarus.dev]-> cat scheme/last-revision
1850
[...@eep:/tmp/ikarus.dev]-> bzr update
M .bzrignore
M Makefile.in
M aclocal.m4
M benchmarks/Makefile.in
M c32
M c64
M config.h.in
M configure
M configure.ac
M doc/Makefile.in
M lib/Makefile.in
M scheme/Makefile.in
M scheme/ikarus.io.ss
M scheme/last-revision
M scheme/makefile.ss
M src/Makefile.in
M src/ikarus-process.c
All changes applied successfully.
Updated to revision 1854.
[...@eep:/tmp/ikarus.dev]->
Which helped me discover that it's happening because building before
updating modifies those files:
[...@eep:/tmp]-> bzr checkout --lightweight -r 1851
http://ikarus-scheme.org/ikarus.dev
[...@eep:/tmp]-> cd ikarus.dev
[...@eep:/tmp/ikarus.dev]-> bzr status
working tree is out of date, run 'bzr update'
[...@eep:/tmp/ikarus.dev]-> ./configure --prefix /tmp
[... 8< ...]
[...@eep:/tmp/ikarus.dev]-> bzr status
working tree is out of date, run 'bzr update'
unknown:
Makefile
config.h
config.log
config.status
stamp-h1
benchmarks/Makefile
doc/Makefile
lib/Makefile
scheme/Makefile
src/.deps/
src/Makefile
[...@eep:/tmp/ikarus.dev]-> make
[... 8< ...]
[...@eep:/tmp/ikarus.dev]-> bzr status
working tree is out of date, run 'bzr update'
modified:
benchmarks/Makefile.in
doc/Makefile.in
lib/Makefile.in
scheme/Makefile.in
src/Makefile.in
unknown:
Makefile
autom4te.cache/
config.h
config.log
config.status
stamp-h1
benchmarks/Makefile
doc/Makefile
lib/Makefile
scheme/Makefile
scheme/ikarus.boot
scheme/ikarus.config.ss
src/.deps/
src/Makefile
src/bootfileloc.h
src/ikarus
src/scheme-script
[...@eep:/tmp/ikarus.dev]-> bzr update
M .bzrignore
M Makefile.in
M aclocal.m4
M benchmarks/Makefile.in
M c32
M c64
M config.h.in
M configure
M configure.ac
M doc/Makefile.in
M lib/Makefile.in
M scheme/Makefile.in
M scheme/ikarus.io.ss
M scheme/last-revision
M scheme/makefile.ss
M src/Makefile.in
M src/ikarus-process.c
Text conflict in benchmarks/Makefile.in
Text conflict in doc/Makefile.in
Text conflict in lib/Makefile.in
Text conflict in scheme/Makefile.in
Text conflict in src/Makefile.in
5 conflicts encountered.
Updated to revision 1854.
[...@eep:/tmp/ikarus.dev]->
For a while in the past, I've noticed building modify those files, so it
must not have been modifying them where it conflicts with the next
update, and for some reason this recent update does conflict.
--
: Derick
----------------------------------------------------------------
