public inbox for gcc@gcc.gnu.org
 help / color / mirror / Atom feed
From: Tom Lord <lord@emf.net>
To: gcc@gcc.gnu.org
Cc: torvalds@transmeta.com
Subject: Re: source mgt....[_HAS_ gcc relevance]
Date: Sat, 14 Dec 2002 23:12:00 -0000	[thread overview]
Message-ID: <200212150448.UAA01297@emf.net> (raw)
In-Reply-To: <Pine.LNX.4.44.0212142009590.2216-100000@penguin.transmeta.com> (message from Linus Torvalds on Sat, 14 Dec 2002 20:13:35 -0800 (PST))



       The advantage of the SCM-assisted merges is really that when
       you trust the other side, it becomes a non-issue.

It helps even when you don't implicitly trust the other side.

A remote, less-than-implicitly-trusted developer submits a patch.  You
kick it back with comments.   Meanwhile, your mainline has gone on.

Before resubmitting, that developer has to update his patch to reflect
the new head-of-mainline.

If that remote developer has his own repository, but a true,
first-class branch of your mainline, then he can use SCM-assisted
merges to keep his patch up-to-date.

A similar case occurs if you accept his patch, but then there's still
more to be done with it -- further development.  In that case, there's
effectively back-and-forth merging between your mainline and his
remote branch.  "star topology merging" handles exactly that case.

In relation to these features, it's interesting to read the recent
narrowly-on-topic traffic on the gcc list (Mark and Zack's
coordination with everyone else, comments about forming intermediate
merges, and calls for help with testing branches).  I think that some
of the issues around synchronizing work would be somewhat relaxed by
applying these features; intermediate merges would be well
facilitated and _partially_ automated (regardless of access writes of the
authors); testing branches could be made more effectively
automated (again, orthogonally to access rights).

-t

  reply	other threads:[~2002-12-15  5:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-12-14 20:16 source mgt. requirements solicitation Nathanael Nerode
2002-12-14 21:34 ` Linus Torvalds
2002-12-14 23:12   ` Tom Lord [this message]
2002-12-14 22:12     ` source mgt....[_HAS_ gcc relevance] Linus Torvalds
2002-12-15  3:04     ` Zack Weinberg
2002-12-15  3:23       ` Tom Lord
2002-12-16  3:05 Robert Dewar
2002-12-16  4:15 ` Tom Lord
2002-12-16  4:40   ` Tom Lord
2002-12-16 16:36   ` Florian Weimer
2002-12-17  0:38     ` Momchil Velikov
2002-12-17 11:41       ` Daniel Egger
2002-12-17 13:17       ` Tom Lord
2002-12-16  4:56 Richard Kenner
2002-12-16  5:33 ` Tom Lord
2002-12-18 11:03 Robert Dewar

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=200212150448.UAA01297@emf.net \
    --to=lord@emf.net \
    --cc=gcc@gcc.gnu.org \
    --cc=torvalds@transmeta.com \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).