* bug#14077: building with conflicts
@ 2013-03-28 19:28 Joe Corneli
2013-03-30 0:57 ` Glenn Morris
0 siblings, 1 reply; 2+ messages in thread
From: Joe Corneli @ 2013-03-28 19:28 UTC (permalink / raw)
To: 14077
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* bug#14077: building with conflicts
2013-03-28 19:28 bug#14077: building with conflicts Joe Corneli
@ 2013-03-30 0:57 ` Glenn Morris
0 siblings, 0 replies; 2+ messages in thread
From: Glenn Morris @ 2013-03-30 0:57 UTC (permalink / raw)
To: 14077-done
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-30 0:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-28 19:28 bug#14077: building with conflicts Joe Corneli
2013-03-30 0:57 ` Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.