From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
Subject: Re: Merging emacs-23 into trunk
Date: Thu, 11 Nov 2010 11:28:39 +0900 [thread overview]
Message-ID: <87wrokegq0.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <E1PG9LH-0007HP-Vc@fencepost.gnu.org>
Eli Zaretskii writes:
> > From: "Stephen J. Turnbull" <stephen@xemacs.org>
> > Date: Wed, 10 Nov 2010 14:44:49 +0900
> > Cc: Stefan Monnier <monnier@IRO.UMontreal.CA>, emacs-devel@gnu.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.
>
> 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.
The DAG-based merging helps to enforce this because there's no way
that the VCS can determine that these changes are related via
syntactic analysis, and humans won't always get it right. So DAG-
based merging takes branch history as the proxy for relatedness.
That's why workflows are so important. If you want a "better" notion
of relatedness, use Darcs, which is designed to be more or less
workflow-free (but in practice doesn't achieve that yet).
The fact that Bazaar doesn't handle the situation very well is quite
apart from the design philosophy.
next prev parent reply other threads:[~2010-11-11 2:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 21:30 Merging emacs-23 into trunk Stefan Monnier
2010-11-10 4:34 ` Glenn Morris
2010-11-10 5:44 ` Stephen J. Turnbull
2010-11-10 11:59 ` Eli Zaretskii
2010-11-11 2:28 ` Stephen J. Turnbull [this message]
2010-11-11 6:32 ` Eli Zaretskii
2010-11-11 8:39 ` Stephen J. Turnbull
2010-11-11 9:11 ` Eli Zaretskii
2010-11-11 12:29 ` Stephen J. Turnbull
2010-11-10 9:01 ` Andreas Schwab
2010-11-10 15:38 ` Stefan Monnier
2010-11-10 17:28 ` Glenn Morris
2010-11-10 20:42 ` Glenn Morris
2010-11-10 22:30 ` Chad Brown
2010-11-11 4:02 ` Eli Zaretskii
2010-11-11 5:09 ` Kenichi Handa
2010-11-11 19:55 ` Glenn Morris
2010-11-11 20:01 ` Lennart Borgman
2010-11-11 20:23 ` Óscar Fuentes
2010-11-11 20:49 ` Eli Zaretskii
2010-11-10 12:03 ` Eli Zaretskii
2010-11-10 15:46 ` Stefan Monnier
2010-11-10 17:21 ` Eli Zaretskii
2010-11-10 19:03 ` Stefan Monnier
2010-11-10 19:19 ` Eli Zaretskii
2010-11-10 19:36 ` Óscar Fuentes
2010-11-11 6:26 ` Eli Zaretskii
2010-11-11 17:13 ` Óscar Fuentes
2010-11-11 2:52 ` Stephen J. Turnbull
2010-11-11 6:38 ` Eli Zaretskii
2010-11-10 19:32 ` Óscar Fuentes
2010-11-11 19:57 ` Stefan Monnier
2010-11-11 20:20 ` Óscar Fuentes
[not found] ` <jwvd3qbo3z1.fsf-monnier+emacs@gnu.org>
2010-11-12 16:51 ` Óscar Fuentes
2010-11-12 20:41 ` Stefan Monnier
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wrokegq0.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.