On Fri, Aug 05, 2005 at 09:56:57AM -0300, [EMAIL PROTECTED] 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 _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
