Re: Merging emacs-23 into trunk

["Stephen J. Turnbull" <stephen@xemacs.org>]

Glenn Morris writes:

 > Can you make it just skip merging configure altogether?

Not really.  That's inherent in the philosophy of atomic commits and
DAG-based merging.

A very dedicated maintainer with nothing better to do might be able to
make it appear like it isn't being merged by maintaining a separate
"no-configure" branch in which configure has been "bzr rm'd", then
merging Branch-A --> no-configure --> Branch-B.  I suspect that the
Branch-A --> no-configure merge will throw a remove/modify conflict
every time, but even if so this should be easy to automate with a
"bzr replay-recorded-resolution" command (a la git's "rerere" command,
if you know about that).  If there isn't one already, the Bazaar team
might be willing to cons one up.  Similar considerations would apply
on the no-configure --> Branch-B side.