[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    Re: [darcs-devel] [darcs #558] Don't allow 'record' for files with
From:       David Roundy <droundy () abridgegame ! org>
Date:       2005-10-30 12:16:46
Message-ID: 20051030121640.GH6950 () abridgegame ! org
[Download RAW message or body]

On Tue, Oct 18, 2005 at 11:29:23AM -0400,  via RT wrote:
> When CVS puts conflict markers into a file, it won't allow that file to
> be committed again until the markers have been removed (ie the conflict
> has, one hopes, been resolved). Any chance of this facility in darcs?
> Also of improved markers indicating which patch provided each possible
> block, like CVS puts the version numbers in? Thanks.

This is a reasonable suggestion, albeit potentially expensive.  Still, I
guess it's only O(N), while diffing is more expensive.  (But I don't have
time for this at the moment.)

> PS. Does 'darcs resolve' actually do anything? ;-)

Yeah, it should mark any conflicts.
-- 
David Roundy
http://www.darcs.net

_______________________________________________
darcs-devel mailing list
darcs-devel@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[prev in list] [next in list] [prev in thread] [next in thread]