[darcs-users] addfile conflict resolved without a merger?

Andrew Pimlott andrew at pimlott.net
Tue May 11 20:46:23 UTC 2004


On Fri, May 07, 2004 at 06:23:41AM -0400, David Roundy wrote:
> I just got around to taking a look at this, and "most recent" darcs is a
> bit better-behaved.  It "resolves" the conflict by removing the file from
> the repo, but leaving the "goodbye" contents untouched in the working repo,
> so 
> 
> b% darcs whatsnew 
> {
> hunk ./world 1
> -hello
> rmfile ./world
> }
> b% cat world 
> goodbye
> 
> This isn't entirely intuitive, but at least doesn't destroy the user
> information, and doesn't lead to corruption as the old behavior did.

Not only not intuitive, but it doesn't give the user any information to
resolve the conflict with.  But, yes, better than corruption.

Andrew




More information about the darcs-users mailing list