On 2006-05-21, Geoffrey Alan Washburn <[EMAIL PROTECTED]> wrote:
> Clemens Fruhwirth wrote:
>
> > At Sat, 20 May 2006 12:01:26 -0400,
> > Geoffrey Alan Washburn <[EMAIL PROTECTED]> wrote:
> >
> >> Did any of this ever get merged into the darcs trunk, or at
> >> least put into a "private" darcs branch?
> >
> > No.
> >
> >> It would be nice to be use version control to keep these
> >> modifications better synchronized with the trunk.
> >
> > Yes, it'd be nice. To be honest, I'm not interested. Would you like to
> > do that?
>
> I am considering it, but I have to admit on my first attempt
> I was unable to discern how to merge the patches made to the 20060305
> version with what is currently in darcs.
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.
--
Tuomo
