Re: Merging emacs-23 into trunk

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Cc: address@hidden,
>     address@hidden
> Date: Thu, 11 Nov 2010 11:28:39 +0900
> 
>  > >  > Can you make it just skip merging configure altogether?
>  > > 
>  > > Not really.  That's inherent in the philosophy of atomic commits and
>  > > DAG-based merging.
>  > 
>  > I don't follow.  Do you have in mind a revision where configure was
>  > committed together with other files?  If so, I understand.  But if it
>  > was committed alone, what is the issue with atomic commits?
> 
> The words "philosophy" and "and" in my statement are crucial.  Of
> course we've learned how to split an atom.  But then it's not an atom
> any more.  Similarly, if you are going to commit changes to a
> generated file, then it should be committed with the source changes
> that generate them.

If committing configure alone is all we need to avoid the problem, we
could decide to do that, philosophical and atom-splitting issues
notwithstanding.

Alternatively, "bzr revert configure" before committing the merges
should also do.