{"thread":{"id":"167","subject":"Re: [darcs-devel] Darcs and git: plan of action","startedAt":"2005-04-20T07:55:28Z","lastAt":"2005-04-20T07:55:28Z","messageCount":1,"participants":["Juliusz Chroboczek"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"955","messageId":"7iy8bdswzz.fsf@lanthane.pps.jussieu.fr","threadId":"167","inReplyTo":"20050419235832.56117.qmail@web51003.mail.yahoo.com","subject":"Re: [darcs-devel] Darcs and git: plan of action","fromName":"Juliusz Chroboczek","fromEmail":"juliusz.chroboczek@pps.jussieu.fr","sentAt":"2005-04-20T07:55:28Z","receivedAt":"2005-04-20T07:55:28Z","isPatch":false,"sender":{"key":"juliusz.chroboczek@pps.jussieu.fr","avatar":null},"body":"> We're talking about interoperating with a Git repository here,\n> right?  Even if we got the metadata in there, doesn't Git have to\n> understand a replace patch for things to work out?\n\n> 0. All three are in sync to begin with.\n\n> 1. CC creates a token-replace patch, sends the changes in normal hunk\n> format to AA.\n\n> 2. BB makes changes, sends a normal hunk patch to AA and CC.  AA will\n> apply the hunk normally.  For CC the token replace might apply here\n> and so the result could be different.\n\n3. when AA and CC try to sync, they will get spurious merge conflicts.\n\n> Isn't this a potential problem?\n\nIt is.  In a heterogeneous environment they will get spurious merge\nconflicts.\n\n                                        Juliusz\n"}]}