[darcs-users] what filenames should be suggested in this conflict?
David Roundy
droundy at darcs.net
Sat Aug 6 11:07:28 UTC 2005
On Fri, Aug 05, 2005 at 09:56:57AM -0300, zooko at zooko.com wrote:
>
> I tried it in darcs, a full transcript of which is pasted at the end of
> this letter. Darcs did exactly what I wanted -- it raised the merge of
> the two heads to the user as a merge conflict -- except for one thing: it
> suggested to the user that the names to consider where "a" and "c". It
> seems obvious to me that the names to consider are "c" and "d", or else
> perhaps "a", "c", and "d".
>
> Is this a bug in darcs?
Yeah, darcs doesn't have support for "announcing" filename conflicts. The
fact that darcs announces two separate names is just a fluke due to how
darcs decide which files have conflicts.
--
David Roundy
http://www.darcs.net
More information about the darcs-users
mailing list