[darcs-users] Re: what's this mean: darcs failed: Couldn't commute patch past pending.

Mark Stosberg mark at summersault.com
Mon Oct 11 23:19:14 UTC 2004


On 2004-10-09, David Roundy <droundy at abridgegame.org> wrote:
> On Sat, Oct 09, 2004 at 02:38:42AM +0000, Mark Stosberg wrote:
>> So I'm trying out darcs, and I created my first conflict situation.
>> 
>> I was dismayed with the results. Darcs reported two files with
>> conflicts. I appreciated that part. :)
>> 
>> I opened up one file to review the conflict. I could tell that text from 
>> both conflicting repos was in the file. However, there were /no/ markers
>> in the file to indicate where the conflict was.
>
> Most likely what happened was that darcs was able to guess a resolution to
> the conflict, and therefore didn't bother marking it.  This has confused
> enough people, that I'm going to just make darcs always mark conflicts,
> even if there's an obvious resolution.
>
>> So, I tried to unpull the patch. However, I got this error when I tried:
>> 
>>  darcs failed:  Couldn't commute patch past pending.
>> 
>> I read the documentation, but it's still not clear to me: How do I
>> recover from a conflict and resolve it? How am I supposed to identify the
>> conflict without the markers?
>
> You can see the conflict resolution by running darcs whatsnew.  In order to
> unpull the patch, you have to revert the conflict resolution.


-- 
http://mark.stosberg.com/ 





More information about the darcs-users mailing list