emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: configure{.in,} question


From: Stefan Monnier
Subject: Re: configure{.in,} question
Date: Mon, 25 Oct 2010 15:59:19 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

>>> 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]