git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: Petr Baudis <pasky@ucw.cz>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
	tglx@linutronix.de, git@vger.kernel.org
Subject: Re: [PATCH] [RFD] Add repoid identifier to commit [its a workspace id, isn't it?]
Date: Sat, 14 May 2005 15:02:41 +1000	[thread overview]
Message-ID: <2cfc403205051322026f3189da@mail.gmail.com> (raw)
In-Reply-To: <2cfc403205051316495b46115e@mail.gmail.com>

Of course, this graph wasn't really the best example of a traditional
SCM branch or the point I was trying to make.
> 
> Rn -------------
> |      \         \
> Rn-1 Ba,n   Bb,n
> |     /             |
> Rn-2             |
> |       \           |
> Rn-3 Ba,n-1  |
> |    /             /
> Rn-4 -----------

It's more like:

Tn     B,W(a),n
|        |                 \
|        B,W(a),n-1   B,W(b),n-1
|        |                  |
Tn-1  |                   |
|        B,W(a),1------|
|       /
Tn-2

Branch B diverges from the main trunk T, parallel (but frequently
convergent) development in branch B happens in two workspaces W(a) and
W(b).

So a branchid would track all commits that contribute to a branch,
while a workspace id would track which commits happened in which
workspace, to enable the reconstruction of the merge order of the
global history with respect to the workspaces that perform commits.

jon.
-- 
homepage: http://www.zeta.org.au/~jon/
blog: http://orwelliantremors.blogspot.com/

      reply	other threads:[~2005-05-14  5:02 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-11 21:38 [PATCH] [RFD] Add repoid identifier to commit Thomas Gleixner
2005-05-11 22:00 ` Sean
2005-05-11 22:05   ` Thomas Gleixner
2005-05-11 22:24     ` Sean
2005-05-11 22:30       ` Thomas Gleixner
2005-05-11 22:36         ` Sean
2005-05-11 22:48           ` Thomas Gleixner
2005-05-11 23:01             ` Sean
2005-05-11 23:33               ` Thomas Gleixner
2005-05-11 23:44                 ` Sean
2005-05-12  0:30                   ` Thomas Gleixner
2005-05-12  0:45                     ` Sean
2005-05-12  0:56                       ` Thomas Gleixner
2005-05-12  0:58                         ` Sean
2005-05-12 10:07                           ` David Woodhouse
2005-05-12 10:18                             ` Sean
2005-05-12 10:42                               ` Thomas Gleixner
2005-05-12 10:43                               ` David Woodhouse
2005-05-12 10:58                                 ` Sean
2005-05-12 10:39                             ` Sean
2005-05-11 23:14 ` H. Peter Anvin
2005-05-11 23:38   ` Thomas Gleixner
2005-05-11 23:40     ` H. Peter Anvin
2005-05-11 23:45       ` Sean
2005-05-12  0:04         ` H. Peter Anvin
2005-05-12  0:20           ` Sean
2005-05-12  0:33       ` Thomas Gleixner
2005-05-12  1:46         ` Junio C Hamano
2005-05-12  7:57           ` Thomas Gleixner
2005-05-12  9:32             ` Sean
2005-05-12  9:39               ` Thomas Gleixner
2005-05-12  9:46                 ` Sean
2005-05-12 11:18                   ` Thomas Gleixner
2005-05-12 11:24                     ` Sean
2005-05-12 11:43                       ` Thomas Gleixner
2005-05-12 11:48                         ` Sean
2005-05-12 12:16                           ` Thomas Gleixner
2005-05-12 12:16                             ` Sean
2005-05-12 12:34                               ` Thomas Gleixner
2005-05-12 12:35                                 ` Sean
2005-05-12 12:17                             ` Sean
2005-05-12 12:29                           ` David Woodhouse
2005-05-12 12:32                             ` Sean
2005-05-12 13:29                         ` Jan Harkes
2005-05-12 15:44                           ` Jon Seymour
2005-05-12 15:48                             ` Jon Seymour
2005-05-12 15:50                               ` Jon Seymour
2005-05-12 16:20                                 ` Jan Harkes
2005-05-12 17:09                                   ` Jon Seymour
2005-05-12 17:12                                     ` Jon Seymour
2005-05-12 17:35             ` Junio C Hamano
2005-05-12 18:18               ` Sean
2005-05-12 19:24                 ` Junio C Hamano
2005-05-12 19:35                   ` Sean
2005-05-12 20:47               ` Thomas Gleixner
2005-05-12 21:09                 ` Sean
2005-05-12 21:21                   ` Thomas Gleixner
2005-05-12 21:32                     ` Sean
2005-05-12 21:44                       ` Junio C Hamano
2005-05-12 22:06                       ` Thomas Gleixner
2005-05-12 22:24                         ` Sean
2005-05-12  0:41     ` Dmitry Torokhov
2005-05-12  0:44       ` Thomas Gleixner
2005-05-12  1:09         ` H. Peter Anvin
2005-05-12  1:13           ` H. Peter Anvin
2005-05-12  3:30             ` Joel Becker
2005-05-12  9:17             ` Thomas Gleixner
2005-05-13  1:37   ` [PATCH] [RFD] Add repoid identifier to commit [its a workspace id, isn't it?] Jon Seymour
2005-05-13  8:36     ` Thomas Gleixner
2005-05-13 22:25     ` Petr Baudis
2005-05-13 22:26       ` H. Peter Anvin
2005-05-13 23:39         ` Petr Baudis
2005-05-13 23:49       ` Jon Seymour
2005-05-14  5:02         ` Jon Seymour [this message]

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=2cfc403205051322026f3189da@mail.gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=hpa@zytor.com \
    --cc=jon@blackcubes.dyndns.org \
    --cc=pasky@ucw.cz \
    --cc=tglx@linutronix.de \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).