[debbugs-tracker] bug#14077: closed (building with conflicts)

[GNU bug Tracking System]

Your message dated Fri, 29 Mar 2013 20:57:50 -0400
with message-id <address@hidden>
and subject line Re: bug#14077: building with conflicts
has caused the debbugs.gnu.org bug report #14077,
regarding building with conflicts
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
14077: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14077
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> building with conflicts
>
>
>
>
> Date: 
>
> Thu, 28 Mar 2013 20:28:52 +0100
>
>
>
>
> 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.
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#14077: building with conflicts
>
>
>
>
> Date: 
>
> Fri, 29 Mar 2013 20:57:50 -0400
>
>
>
>
> User-agent: 
>
> Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
>
>
>
>
> 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.
>
>
> --- End Message ---