Suvayu Ali writes:
> I am having an odd problem, after I checkout CEDET from the bzr HEAD I
> edit the Makefile and commit the changes and then compile with `make all
> -j2'. Now when I want to update, I do `make clean-all' then try to
> update with `bzr merge --pull'. But every time bzr tells me there are
> other files which have been modified (the changes usually look like only
> whitespace changes, from the output of `bzr diff').
> Since I didn't change them, I presume they get changed during the first
> build. So I end up deleting the whole directory and checking out afresh
> again. I am sure I am doing something very stupid. How should I go about
> doing this? This methodology had worked quite well with emacs 24 HEAD.
Yes, files get changed during the build. This is unfortunate and due to
bzr not preserving timestamps from the repo. Newer bzr versions at least
make sure that all files have the same timestamp; we'll still have to
fix a few things in the grammar-compilation, though.
Anyhow, if you do 'bzr revert' it should reverse those changes and you
can then pull from the repo.
Other people prefer to always have a pristine 'trunk' and to use
branches for everything else. You could create a 'build' branch by doing
bzr branch cedet/trunk cedet/build
Then you only 'pull' in the trunk-directory, whereas you make/hack in
build. After pulling in trunk, you can 'merge' in build to apply the