merging patches

[Ross Paterson]

On Tue, Feb 27, 2007 at 10:52:42AM +0000, Simon Marlow wrote:
> Ross Paterson wrote:
> >What's the recommended way to merge patches from the HEAD to
> >ghc-6.6/packages/* ?  I tried pushing between local copies, but that
> >failed because the 6.6 repository is partial (starts in Jan 2006).
> 
> Using a non-partial HEAD works for me.  When both repositories are partial, 
> strange things happen.

I have a complete HEAD repo, and a 6.6 repo I got from

	darcs.haskell.org:/home/darcs/ghc-6.6/packages/Cabal

It is partial, starting from January 2006.  When I try to push a patch
to it from the HEAD repo, I get

darcs: Cannot apply this patch bundle, this is a "--partial repository
We don't have the following patch:
Tue Sep 13 06:03:55 BST 2005  ijones at syntaxpolice.org
  * fixes for haddock for 1.1.3