[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging emacs-23 into trunk
From: |
Eli Zaretskii |
Subject: |
Re: Merging emacs-23 into trunk |
Date: |
Wed, 10 Nov 2010 06:59:55 -0500 |
> From: "Stephen J. Turnbull" <address@hidden>
> Date: Wed, 10 Nov 2010 14:44:49 +0900
> Cc: Stefan Monnier <address@hidden>, address@hidden
>
> 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.
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?
- Merging emacs-23 into trunk, Stefan Monnier, 2010/11/09
- Re: Merging emacs-23 into trunk, Glenn Morris, 2010/11/09
- Re: Merging emacs-23 into trunk, Stephen J. Turnbull, 2010/11/10
- Re: Merging emacs-23 into trunk,
Eli Zaretskii <=
- Re: Merging emacs-23 into trunk, Stephen J. Turnbull, 2010/11/10
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/11
- Re: Merging emacs-23 into trunk, Stephen J. Turnbull, 2010/11/11
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/11
- Re: Merging emacs-23 into trunk, Stephen J. Turnbull, 2010/11/11
Re: Merging emacs-23 into trunk, Andreas Schwab, 2010/11/10
Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/10