From: Juliusz Chroboczek <Juliusz.Chroboczek@pps.jussieu.fr>
To: darcs-devel@abridgegame.org, git@vger.kernel.org
Subject: Re: [darcs-devel] Darcs and git: plan of action
Date: Wed, 20 Apr 2005 09:55:28 +0200 [thread overview]
Message-ID: <7iy8bdswzz.fsf@lanthane.pps.jussieu.fr> (raw)
In-Reply-To: <20050419235832.56117.qmail@web51003.mail.yahoo.com> (Kannan Goundan's message of "Tue, 19 Apr 2005 16:58:32 -0700 (PDT)")
> We're talking about interoperating with a Git repository here,
> right? Even if we got the metadata in there, doesn't Git have to
> understand a replace patch for things to work out?
> 0. All three are in sync to begin with.
> 1. CC creates a token-replace patch, sends the changes in normal hunk
> format to AA.
> 2. BB makes changes, sends a normal hunk patch to AA and CC. AA will
> apply the hunk normally. For CC the token replace might apply here
> and so the result could be different.
3. when AA and CC try to sync, they will get spurious merge conflicts.
> Isn't this a potential problem?
It is. In a heterogeneous environment they will get spurious merge
conflicts.
Juliusz
next parent reply other threads:[~2005-04-20 7:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050419235832.56117.qmail@web51003.mail.yahoo.com>
2005-04-20 7:55 ` Juliusz Chroboczek [this message]
2005-04-18 21:04 [darcs-devel] Darcs and git: plan of action linux
2005-04-19 0:07 ` Ray Lee
2005-04-19 1:05 ` Kevin Smith
2005-04-19 1:42 ` Ray Lee
2005-04-19 2:05 ` Kevin Smith
2005-04-19 22:08 ` Patrick McFarland
2005-04-19 22:40 ` Ray Lee
2005-04-19 23:03 ` [darcs-devel] " Kevin Smith
2005-04-19 23:06 ` Ray Lee
2005-04-19 23:32 ` Tupshin Harper
2005-04-20 1:11 ` [darcs-devel] " Ray Lee
2005-04-20 7:52 ` Juliusz Chroboczek
2005-04-20 11:55 ` David Roundy
2005-04-20 17:11 ` Ralph Corderoy
2005-04-19 11:05 ` David Roundy
[not found] <7ivf6lm594.fsf@lanthane.pps.jussieu.fr>
2005-04-18 12:20 ` David Roundy
2005-04-18 15:38 ` Linus Torvalds
2005-04-19 10:42 ` [darcs-devel] " David Roundy
2005-04-19 14:55 ` Linus Torvalds
2005-04-19 16:33 ` [darcs-devel] " Tupshin Harper
2005-04-19 16:49 ` Linus Torvalds
2005-04-18 18:35 ` Ray Lee
2005-04-19 0:55 ` Juliusz Chroboczek
2005-04-19 1:43 ` [darcs-devel] " Ray Lee
2005-04-19 8:22 ` Juliusz Chroboczek
2005-04-20 1:22 ` Ray Lee
2005-04-19 11:04 ` David Roundy
2005-04-19 12:20 ` Juliusz Chroboczek
2005-04-19 12:25 ` [darcs-devel] " Petr Baudis
2005-04-20 11:18 ` David Roundy
2005-04-20 11:29 ` David Roundy
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=7iy8bdswzz.fsf@lanthane.pps.jussieu.fr \
--to=juliusz.chroboczek@pps.jussieu.fr \
--cc=darcs-devel@abridgegame.org \
--cc=git@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).