From: Juliusz Chroboczek <juliusz.chroboczek@pps.jussieu.fr>
Date: Wed, 20 Apr 2005 07:55:28 GMT
Subject: Re: [darcs-devel] Darcs and git: plan of action
Message-ID: <7iy8bdswzz.fsf@lanthane.pps.jussieu.fr>
In-Reply-To: <20050419235832.56117.qmail@web51003.mail.yahoo.com>

> 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