From: Russell King <rmk@arm.linux.org.uk>
To: Petr Baudis <pasky@ucw.cz>
Cc: Linus Torvalds <torvalds@osdl.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Re-done kernel archive - real one?
Date: Tue, 19 Apr 2005 08:27:56 +0100 [thread overview]
Message-ID: <20050419082756.A13105@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20050418230941.GN5554@pasky.ji.cz>; from pasky@ucw.cz on Tue, Apr 19, 2005 at 01:09:42AM +0200
On Tue, Apr 19, 2005 at 01:09:42AM +0200, Petr Baudis wrote:
> > Essentially, with BK, at 7am localtime each morning, I'd:
> >
> > - update my baseline linux 2.6 tree
> > - for each working tree which may be pulled from
> > - if the baseline is a superset
> > - update working tree from baseline
> >
> > The net result is that my workflow consisted entirely of:
> >
> > 1. commit whatever into working tree
> > 2. test
> > 3. send linus a pull request
> > 4. repeat next day
> >
> > The tree resynchronisation happened completely and entirely in the
> > background with no user intervention required at all.
>
> And in the case of conflicts...?
If the baseline is a superset of the working tree, there will never be
any conflicts. Note that as I said above, this is a condition on doing
the pull in the first place.
How we determine that with git is another matter though. 8)
--
Russell King
next prev parent reply other threads:[~2005-04-19 7:24 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-16 23:01 Re-done kernel archive - real one? Linus Torvalds
2005-04-17 15:24 ` Russell King
2005-04-17 16:28 ` Petr Baudis
2005-04-17 16:36 ` Linus Torvalds
2005-04-17 18:57 ` Russell King
2005-04-17 19:33 ` Linus Torvalds
2005-04-17 19:45 ` Linus Torvalds
2005-04-17 19:51 ` Russell King
2005-04-17 20:08 ` Linus Torvalds
2005-04-17 20:11 ` Russell King
2005-04-17 20:26 ` Linus Torvalds
2005-04-17 20:42 ` Russell King
2005-04-18 22:16 ` Russell King
2005-04-18 22:33 ` Petr Baudis
2005-04-18 23:29 ` Linus Torvalds
2005-04-18 23:53 ` Petr Baudis
2005-04-17 16:05 ` Russell King
2005-04-17 16:44 ` Linus Torvalds
2005-04-17 18:13 ` David A. Wheeler
2005-04-17 18:14 ` Petr Baudis
2005-04-17 18:20 ` Russell King
2005-04-17 18:44 ` David A. Wheeler
2005-04-18 11:15 ` Martin Schlemmer
2005-04-17 20:21 ` H. Peter Anvin
2005-04-17 21:50 ` Jochen Roemling
2005-04-17 22:09 ` Randy.Dunlap
2005-04-17 22:30 ` Petr Baudis
2005-04-17 21:52 ` David Woodhouse
2005-04-17 22:17 ` Linus Torvalds
2005-04-17 22:19 ` Russell King
2005-04-17 22:51 ` Russell King
2005-04-17 23:24 ` Linus Torvalds
2005-04-18 9:23 ` Russell King
2005-04-18 11:14 ` Martin Schlemmer
2005-04-18 11:15 ` Petr Baudis
2005-04-18 15:23 ` Linus Torvalds
2005-04-18 17:05 ` Linus Torvalds
2005-04-18 18:07 ` Petr Baudis
2005-04-18 21:53 ` Russell King
2005-04-18 22:01 ` Linus Torvalds
2005-04-18 22:48 ` Petr Baudis
2005-04-18 22:59 ` Russell King
2005-04-18 23:09 ` Petr Baudis
2005-04-19 7:27 ` Russell King [this message]
2005-04-18 23:31 ` Linus Torvalds
2005-04-18 21:33 ` Russell King
2005-04-18 21:56 ` Linus Torvalds
2005-04-18 14:22 ` Petr Baudis
2005-04-18 15:04 ` Greg KH
2005-04-18 15:25 ` Randy.Dunlap
2005-04-18 15:42 ` Linus Torvalds
2005-04-18 22:05 ` Greg KH
2005-04-18 22:14 ` Greg KH
2005-04-18 23:16 ` Linus Torvalds
2005-04-18 23:26 ` Greg KH
2005-04-18 23:10 ` Linus Torvalds
2005-04-17 22:20 ` H. Peter Anvin
2005-04-17 22:22 ` randy_dunlap
2005-04-17 23:21 ` David Woodhouse
2005-04-18 1:33 ` randy_dunlap
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050419082756.A13105@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
--cc=torvalds@osdl.org \
/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 public inbox
https://80x24.org/mirrors/git.git
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).