Re: ion-therp branch update

[Geoffrey Alan Washburn]

Tuomo Valkonen wrote:

Assuming ion-full is an up-to-date full darcs repository:

$ darcs get --tag=ion-3ds-20060305 ion-full ion-3ds-20060305
$ cd ion-3ds-20060305
repeat for each patch:
    $ apply it with diff
    $ darcs record -a
        (you may want to set --author to to the original one..)
$ cd ../ion-full
$ darcs pull -a -v ../ion-3ds-20060305
        (You could also pull from ion-full to ion-3ds-20060305...)
If there are conflicts, resolve them and either:
    a) record (a) new conflict-resolution patch(es)
    b) 'darcs amend-record' the conflict resolutions to the 
       just-pulled patches. You must then ditch the versions in
       ion-3ds-20060305 so that old incompatible versions aren't
       floating around.


	Ah.  Okay, that's a better strategy.  I was trying to patch straight to 
the current version in darcs, which wasn't really working very cleanly.