On Sep 3, 2009, at 1:29 AM, Derick Eddington wrote:
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.
Ahhh! That's because in this revision, I've switched to using
newer versions of automake/autoconf/etc, so, my modifications
and your local modifications did indeed conflict. Interesting.
Either way, you could also probably just delete everything in
your working directory (except the .bzr directory) and then do
bzr revert, or do "bzr revert -r -2 && bzr revert" or something
like that.
Aziz,,,
