Subject: Re: bug#14077: building with conflicts
From: Glenn Morris <[email-masked]>
To: [email-masked]
Date: Fri, 29 Mar 2013 20:57:50 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Joe Corneli wrote:

> Symbol's value as variable is void: <<<<<<<
> make[2]: *** [bootstrap-emacs] Error 1
> make[1]: *** [src] Error 2
> make: *** [bootstrap] Error 2
>
> Upon further investigation there were unmerged conflicts in
> buff-menu.el (not sure how they got there) - but it would be great to
> get a warning in advance about unmerged conflicts before make
> bootstrap.

The warning is found in the output of `bzr pull' (or whatever command
you use), you just need to look for it.

Such problems should be rare, and easy to diagnose, so I see no point
in adding special handling for this to the Emacs build process.