merging patches

[Ian Lynagh]

On Tue, Feb 27, 2007 at 01:50:53PM +0000, Simon Marlow wrote:
> Ross Paterson wrote:
> >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
> 
> Pulling instead of pushing sometimes works.

Also, an easy mistake to make is to push to the GHC-6.6 repo rather than
the Cabal-for-GHC-6.6 repo.

> Failing that, we should try to 
> make a non-partial version of this repository.  Ian?

packages/Cabal should now be complete. While I was there I also made the
ghc repo itself complete, to work around the bug where darcs wasn't
letting us checkpoint the repo.

The incomplete repos are in /home/darcs/ghc-6.6/incomplete/ just in
case.


Thanks
Ian