Re: Applying patches to 2.0 from 1.2.

From: Mike Kienenberger (mkienen..mail.com)
Date: Wed Aug 16 2006 - 19:49:57 EDT

  • Next message: Andrus Adamchik: "Re: Removing Log4J"

    I wish I could report how easy it was to apply this patch from the
    command-line :-)
    But my patch program didn't want to do it. I finally had to resort to this.

    patch --ignore-whitespace -F 3 XMLEncoderTst.java <
    z:\XMLEncoderTst.patch1.2.txt

    On 8/16/06, Mike Kienenberger <mkienen..mail.com> wrote:
    > Ok. That works :-)
    >
    >
    > On 8/16/06, Andrus Adamchik <andru..bjectstyle.org> wrote:
    > > Exactly. I checked out 2.0 in a separate dir and apply patches from
    > > command line. Before applying a patch I manually edit it,
    > > substituting "objectstyle" with "apache" in the imports and file
    > > names. Never needed to open 2.0 in Eclipse, as there is no
    > > development going on there, just merging with 1.2.
    > >
    > > Andrus
    > >
    > >
    > > On Aug 16, 2006, at 7:07 PM, Mike Kienenberger wrote:
    > >
    > > > Andrus,
    > > >
    > > > What process are you following to apply a 1.2 patch to 2.0 (or vice-
    > > > versa?)
    > > >
    > > > I'm guessing you've somehow got both versions checked out (two
    > > > workspaces?) and create a patch to a file, then replace objectstyle
    > > > with apache and then apply it?
    > > >
    > >
    > >
    >



    This archive was generated by hypermail 2.0.0 : Wed Aug 16 2006 - 19:50:21 EDT