From: Pavel Machek <pavel@suse.cz>
To: Joel Becker <Joel.Becker@oracle.com>
Cc: Jeff Garzik <jgarzik@pobox.com>, "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org
Subject: Re: BitBucket: GPL-ed *notrademarkhere* clone
Date: Thu, 6 Mar 2003 17:47:43 +0100 [thread overview]
Message-ID: <20030306164743.GG2781@zaurus.ucw.cz> (raw)
In-Reply-To: <20030303215356.GE2835@ca-server1.us.oracle.com>
Hi!
> The one thing BK does that makes it worthwhile is the three-way
> merge. This (and the resulting DAG) make handling code from Alan, from
> Linus, from Andrew, and from everyone else possible. With CVS,
> subversion, or any other SCM I've worked with, you have to hand merge
> anything past the first patch. Ugh.
What's so magical about 3way merge?
I thought it would be easy to do even
in CVS...
Pavel
--
Pavel
Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need...
next prev parent reply other threads:[~2003-03-07 10:59 UTC|newest]
Thread overview: 155+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-02 0:11 BitBucket: GPL-ed KitBeeper clone Adam J. Richter
2003-03-02 0:20 ` Larry McVoy
2003-03-02 0:20 ` David Lang
2003-03-02 0:49 ` Arador
2003-03-02 1:03 ` Jeff Garzik
2003-03-02 2:15 ` Alan Cox
2003-03-02 1:19 ` Jeff Garzik
2003-03-02 1:40 ` BitBucket: GPL-ed *notrademarkhere* clone Andrea Arcangeli
2003-03-02 1:45 ` Jeff Garzik
2003-03-02 2:09 ` Andrea Arcangeli
2003-03-02 17:28 ` Jeff Garzik
2003-03-02 18:16 ` Andrea Arcangeli
2003-03-02 20:12 ` Jeff Garzik
2003-03-02 21:49 ` Geert Uytterhoeven
2003-03-03 18:37 ` Larry McVoy
2003-03-03 18:46 ` Larry McVoy
2003-03-03 22:57 ` Andrea Arcangeli
2003-03-03 23:14 ` Pavel Machek
2003-03-03 23:56 ` David Lang
2003-03-04 0:02 ` Jeff Garzik
2003-03-04 0:05 ` Larry McVoy
2003-03-04 0:15 ` Andrea Arcangeli
2003-03-04 0:30 ` Jeff Garzik
2003-03-04 2:20 ` Martin J. Bligh
2003-03-04 5:29 ` Linus Torvalds
2003-03-04 5:56 ` Dimitrie O. Paun
2003-03-04 14:51 ` Jeff Garzik
2003-03-02 3:29 ` H. Peter Anvin
2003-03-02 17:12 ` Jeff Garzik
2003-03-02 18:39 ` H. Peter Anvin
2003-03-02 20:01 ` Jeff Garzik
2003-03-03 0:47 ` nickn
2003-03-03 0:55 ` David Lang
2003-03-03 2:31 ` Jeff Garzik
2003-03-03 2:32 ` Jeff Garzik
2003-03-04 1:07 ` Horst von Brand
2003-03-04 1:10 ` H. Peter Anvin
2003-03-03 21:53 ` Joel Becker
2003-03-04 23:37 ` Olaf Hering
2003-03-06 16:47 ` Pavel Machek [this message]
2003-03-06 16:41 ` Pavel Machek
2003-03-07 11:24 ` Tupshin Harper
2003-03-07 11:28 ` Pavel Machek
2003-03-07 21:53 ` H. Peter Anvin
2003-03-08 23:18 ` Daniel Phillips
2003-03-03 0:13 ` Pavel Machek
2003-03-03 0:10 ` BitBucket: GPL-ed KitBeeper clone Pavel Machek
2003-03-04 16:16 ` David Woodhouse
2003-03-04 16:27 ` Pavel Machek
2003-03-02 1:26 ` Olivier Galibert
2003-03-06 16:18 ` Pavel Machek
2003-03-07 12:12 ` Olivier Galibert
2003-03-07 12:32 ` Pavel Machek
2003-03-07 16:54 ` Olivier Galibert
2003-03-07 17:14 ` Geert Uytterhoeven
2003-03-07 19:08 ` Pavel Machek
2003-03-07 19:25 ` Eli Carter
2003-03-07 20:29 ` Pavel Machek
2003-03-07 23:16 ` Linus Torvalds
2003-03-08 22:52 ` Zack Brown
2003-03-09 0:05 ` Larry McVoy
2003-03-09 1:21 ` Davide Libenzi
2003-03-09 2:45 ` Zack Brown
2003-03-09 3:19 ` Roman Zippel
2003-03-09 3:42 ` Linus Torvalds
2003-03-09 4:32 ` Roman Zippel
2003-03-09 13:34 ` Eric W. Biederman
2003-03-09 15:35 ` Roman Zippel
2003-03-09 16:55 ` Martin J. Bligh
2003-03-09 17:20 ` Zack Brown
2003-03-09 17:48 ` Martin J. Bligh
2003-03-09 19:58 ` Larry McVoy
2003-03-09 21:32 ` Zack Brown
2003-03-09 21:54 ` Valdis.Kletnieks
2003-03-09 23:28 ` Larry McVoy
2003-03-13 20:00 ` Pavel Machek
2003-03-09 17:39 ` Linus Torvalds
2003-03-09 17:58 ` Martin J. Bligh
2003-03-09 18:20 ` Larry McVoy
2003-03-09 23:19 ` fs
2003-03-13 0:41 ` Pavel Machek
2003-03-13 21:21 ` Horst von Brand
2003-03-09 20:01 ` Roman Zippel
2003-03-13 0:13 ` Pavel Machek
2003-03-09 14:49 ` Olivier Galibert
2003-03-13 0:05 ` Pavel Machek
2003-03-10 0:02 ` Thoughts about ideal kernel SCM Petr Baudis
2003-03-10 0:32 ` Larry McVoy
2003-03-12 19:29 ` Petr Baudis
2003-03-13 10:36 ` Pavel Machek
2003-03-14 22:56 ` Petr Baudis
2003-03-17 20:59 ` Petr Baudis
2003-03-10 3:41 ` BitBucket: GPL-ed KitBeeper clone Horst von Brand
2003-03-10 13:52 ` Jamie Lokier
2003-03-10 23:03 ` Daniel Phillips
2003-03-11 18:40 ` Zack Brown
2003-03-11 18:46 ` Martin J. Bligh
2003-03-11 19:30 ` Daniel Phillips
2003-03-11 19:33 ` Martin J. Bligh
2003-03-11 20:08 ` Andrew Morton
2003-03-11 20:29 ` Martin J. Bligh
2003-03-12 6:14 ` Werner Almesberger
2003-03-13 2:48 ` Daniel Phillips
2003-03-13 3:11 ` Werner Almesberger
2003-03-14 12:29 ` Pavel Machek
2003-03-15 20:53 ` Martin J. Bligh
2003-03-15 21:26 ` Daniel Phillips
2003-03-15 21:32 ` Petr Baudis
2003-03-15 23:39 ` Petr Baudis
2003-03-16 0:39 ` Horst von Brand
2003-04-07 21:22 ` Petr Baudis
2003-03-12 3:47 ` Horst von Brand
2003-03-12 4:03 ` Larry McVoy
2003-03-12 4:49 ` [PATCH] ~/kernel/sys.c (2.5.64) (trivial) Jay Patrick Howard
2003-03-12 5:22 ` BitBucket: GPL-ed KitBeeper clone Zack Brown
2003-03-12 5:44 ` Horst von Brand
2003-03-12 13:48 ` Daniel Phillips
2003-03-13 1:03 ` Horst von Brand
2003-03-13 16:53 ` Daniel Phillips
2003-03-15 15:02 ` Horst von Brand
2003-03-15 21:25 ` Daniel Phillips
2003-03-12 6:19 ` Werner Almesberger
2003-03-13 1:31 ` Horst von Brand
2003-03-12 15:32 ` Horst von Brand
2003-03-12 16:13 ` Daniel Phillips
2003-03-12 20:37 ` Horst von Brand
2003-03-12 20:54 ` H. Peter Anvin
2003-03-13 2:00 ` Daniel Phillips
2003-03-15 1:03 ` Horst von Brand
2003-03-12 13:22 ` Daniel Phillips
2003-03-13 0:52 ` Horst von Brand
2003-03-13 17:00 ` Daniel Phillips
2003-03-13 21:48 ` Zack Brown
2003-03-13 22:04 ` Daniel Phillips
2003-03-15 16:21 ` Horst von Brand
2003-03-15 21:25 ` Daniel Phillips
2003-03-15 21:53 ` Robert Anderson
2003-03-15 21:50 ` Randy.Dunlap
2003-03-15 22:16 ` Robert Anderson
2003-03-15 22:18 ` Robert Anderson
2003-03-16 0:18 ` Petr Baudis
2003-03-16 0:53 ` Davide Libenzi
2003-03-16 0:55 ` [arch-users] " Stig Brautaset
2003-03-16 1:44 ` Tom Lord
2003-03-16 2:06 ` Adam Spiers
2003-03-16 3:28 ` David Lang
2003-03-16 5:43 ` Robert Anderson
2003-03-16 11:57 ` (Re: BitBucket: GPL-ed KitBeeper clone) Moving to arch-users Petr Baudis
2003-03-14 11:34 ` BitBucket: GPL-ed KitBeeper clone Pavel Machek
2003-03-12 23:38 ` Pavel Machek
2003-03-09 2:06 ` Horst von Brand
[not found] ` <b4b98v_14m_1@penguin.transmeta.com>
2003-03-12 23:23 ` Pavel Machek
2003-03-13 21:15 ` Horst von Brand
2003-03-08 0:18 ` Olaf Dietsche
2003-03-02 1:37 ` Filip Van Raemdonck
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=20030306164743.GG2781@zaurus.ucw.cz \
--to=pavel@suse.cz \
--cc=Joel.Becker@oracle.com \
--cc=hpa@zytor.com \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.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.
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).