From: Yuri Khan <yuri.v.khan@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: David Kastrup <dak@gnu.org>, Emacs developers <emacs-devel@gnu.org>
Subject: Re: Recording the date at which a change was pushed to Savannah
Date: Wed, 3 Dec 2014 23:19:34 +0700 [thread overview]
Message-ID: <CAP_d_8XLHAy-0=+Za1YC1AFqNPSsbHdU09XvbP9vLOzJ_p-9Mg@mail.gmail.com> (raw)
In-Reply-To: <jwva934j0ef.fsf-monnier+emacs@gnu.org>
On Wed, Dec 3, 2014 at 8:18 PM, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> I think the fundamental thing missing is the "mainline": In Bzr, when
> you look at the DAG of the `trunk', you know which commits are on the
> mainline and which commits were made on a branch and later merged
> onto the mainline.
>
> In Git, you don't know that because you only have the DAG and the
> parents of a merge are "unordered".
Parents are in fact ordered; you can find out each merge’s parents by
addressing them as <rev>^1 for first parent, <rev>^2 etc.
This makes it possible to devise workflows that make it possible to
determine the mainline history. For example, agree that when feature
branches are merged into master, the previous master has to be the
first parent and branches have to be the second and subsequent
parents. Then the mainline is the transitive closure found by starting
at current master and following only the first parents of each commit.
next prev parent reply other threads:[~2014-12-03 16:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 2:55 Recording the date at which a change was pushed to Savannah Glenn Morris
2014-12-02 4:55 ` Yuri Khan
2014-12-02 5:05 ` Stephen J. Turnbull
2014-12-02 13:48 ` Stefan Monnier
2014-12-03 6:22 ` Glenn Morris
2014-12-03 6:47 ` David Kastrup
2014-12-03 7:51 ` Stephen J. Turnbull
2014-12-03 8:35 ` David Kastrup
2014-12-03 9:50 ` Stephen J. Turnbull
2014-12-03 10:04 ` David Kastrup
2014-12-03 14:18 ` Stefan Monnier
2014-12-03 16:19 ` Yuri Khan [this message]
2014-12-03 18:59 ` Stefan Monnier
2014-12-03 18:02 ` Eli Zaretskii
2014-12-03 19:00 ` Stefan Monnier
2014-12-03 19:06 ` Eli Zaretskii
2014-12-03 19:34 ` Stefan Monnier
2014-12-03 20:24 ` Eli Zaretskii
2014-12-03 21:10 ` Stefan Monnier
2014-12-04 2:52 ` Yuri Khan
2014-12-04 6:17 ` Eli Zaretskii
2014-12-04 2:58 ` Glenn Morris
2014-12-04 3:57 ` 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='CAP_d_8XLHAy-0=+Za1YC1AFqNPSsbHdU09XvbP9vLOzJ_p-9Mg@mail.gmail.com' \
--to=yuri.v.khan@gmail.com \
--cc=dak@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.