[darcs-devel] [darcs #557] replace + pull + conflict = lost replace!

[David Roundy]

On Tue, Oct 18, 2005 at 11:15:36AM -0400,  via RT wrote:
> A conflict is exactly what I would expect. However, the conflict is not
> marked in the file. Darcs seems to think the pull was successful: 'darcs
> changes' shows the patch as having been pulled, and 'darcs pull' says
> there are no remote changes to bring in. But what darcs has actually
> done depends on whether I recorded the incompatible change at [*] prior
> to the pull.

Indeed, darcs does not support conflict marking for replace patches, and
this is a real bug.  However, I don't expect to fix this until the
"conflictor" code comes out, at which point conflict marking will have to
be completely rewritten.
-- 
David Roundy
http://www.darcs.net