From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Glenn Morris <rgm@gnu.org>
Cc: julien@danjou.info, Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: configure{.in,} question
Date: Mon, 25 Oct 2010 15:59:19 -0400 [thread overview]
Message-ID: <jwvfwvum4ei.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <xk1v7edsoz.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 25 Oct 2010 14:37:48 -0400")
>>> I often end up with problems because of configure and
>>> src/config.in.
>> Including with bzr? What problems are those?
> If you run autoconf locally (which I think is good practice), and you
> did not use the same version as the person who last committed
> configure, you WILL get a conflict when you update. Eg
Indeed.
>> a feature on the Bazaar list. If you get lucky, you could have a POC
>> plugin in a matter of days.
> But we cannot make everyone who checks out Emacs from bzr use said
> plugin.
Actually, maybe for those files, we could use a merge-helper that just
says "use the most recent file". Of course, since merge helpers are
plugins, that still depends on whether such a merge helper is or will
be included in Bzr proper.
Stefan
next prev parent reply other threads:[~2010-10-25 19:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-24 17:31 configure{.in,} question Lars Magne Ingebrigtsen
2010-10-24 19:38 ` Glenn Morris
2010-10-24 19:56 ` Lars Magne Ingebrigtsen
2010-10-24 20:07 ` Glenn Morris
2010-10-25 0:57 ` Stephen J. Turnbull
2010-10-25 8:38 ` Andreas Schwab
2010-10-25 14:43 ` Stephen J. Turnbull
2010-10-25 14:58 ` Andreas Schwab
2010-10-25 15:41 ` Stephen J. Turnbull
2010-10-25 8:47 ` Julien Danjou
2010-10-25 9:00 ` Andreas Schwab
2010-10-25 9:15 ` Eli Zaretskii
2010-10-25 16:06 ` Stefan Monnier
2010-10-25 18:04 ` Eli Zaretskii
2010-10-25 18:37 ` Glenn Morris
2010-10-25 19:59 ` Stefan Monnier [this message]
2010-10-25 19:34 ` Stefan Monnier
2010-10-25 16:43 ` Glenn Morris
2010-10-25 19:11 ` Ted Zlatanov
2010-10-25 19:13 ` Lars Magne Ingebrigtsen
2010-10-25 19:16 ` Ted Zlatanov
2010-10-25 20:08 ` Lars Magne Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvfwvum4ei.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=julien@danjou.info \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).