From: Petr Baudis <pasky@suse.cz>
To: Horst von Brand <vonbrand@inf.utfsm.cl>
Cc: "Martin Langhoff \(CatalystIT\)" <martin@catalyst.net.nz>,
Dmitry Torokhov <dtor_core@ameritech.net>,
git@vger.kernel.org
Subject: Re: LCA2006 Git/Cogito tutorial
Date: Mon, 24 Oct 2005 00:39:01 +0200 [thread overview]
Message-ID: <20051023223901.GW30889@pasky.or.cz> (raw)
In-Reply-To: <200510231535.j9NFZrmD019309@inti.inf.utfsm.cl>
Dear diary, on Sun, Oct 23, 2005 at 05:35:53PM CEST, I got a letter
where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...
> Petr Baudis <pasky@suse.cz> wrote:
>
> [...]
>
> > Well, it's true that cg-Xmergefile still does not handle all merge
> > cases, but it certainly will not be silent about it, at least. ;-)
>
> The Codeville <http://www.codeville.org> people seem to have taken a hard
> look at merging, but I don't find any clear references to their algorithm.
They are working on something much more general, basically abandoning
the three-level (RCS-like) merging model altogether and going for the
weave (SCCS-like) merging model instead. See also
http://revctrl.org/PreciseCodevilleMerge
and short crawling around the wiki and external links should give you
pretty good idea (see especially SimpleWeaveMerge).
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
next prev parent reply other threads:[~2005-10-23 22:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-17 0:48 LCA2006 Git/Cogito tutorial Martin Langhoff (CatalystIT)
2005-10-21 0:51 ` Petr Baudis
2005-10-21 2:37 ` Dmitry Torokhov
2005-10-21 2:59 ` Martin Langhoff (CatalystIT)
2005-10-21 9:15 ` Petr Baudis
2005-10-23 15:35 ` Horst von Brand
2005-10-23 22:39 ` Petr Baudis [this message]
2005-10-24 8:32 ` Fredrik Kuivinen
2005-10-23 15:33 ` Horst von Brand
2005-10-23 22:40 ` Petr Baudis
2005-10-24 0:22 ` Horst von Brand
2005-10-24 6:25 ` Martin Langhoff
2005-10-24 0:58 ` Junio C Hamano
2005-10-24 1:35 ` Linus Torvalds
2005-10-24 1:48 ` Junio C Hamano
2005-10-24 3:32 ` Linus Torvalds
2005-10-24 7:54 ` Petr Baudis
2005-10-24 9:44 ` Junio C Hamano
2005-10-24 15:04 ` Linus Torvalds
2005-10-21 3:02 ` Martin Langhoff (CatalystIT)
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=20051023223901.GW30889@pasky.or.cz \
--to=pasky@suse.cz \
--cc=dtor_core@ameritech.net \
--cc=git@vger.kernel.org \
--cc=martin@catalyst.net.nz \
--cc=vonbrand@inf.utfsm.cl \
/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).