Just unpulled last 3 patches

[Simon Marlow]

Ian Lynagh wrote:

> On Tue, Sep 04, 2007 at 03:18:45PM +0100, Ben Lippmeier wrote:
>> I just un-pulled the last 3 patches I submitted because one of them had
>> conflicts. 
> 
> Hmm, you shouldn't be able push patches that have unresolved conflicts.

You can push a conflict+resolution in a single bundle, just not a conflict 
on its own.

>> Apparently we're keeping patches with conflicts out of the head to ward off
>> potential problems with darcs. 
> 
> That is true, but the occasional conflict should be harmless, so in my
> opinion it would generally be better to let it be once it is done, as
> unpulling can lead to other headaches.

I asked Ben to unpull these because we caught it quickly enough I figured 
the unpull wouldn't cause too many problems.

Cheers,
	Simon