You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cayenne.apache.org by Mike Kienenberger <mk...@gmail.com> on 2006/08/17 01:07:57 UTC
Applying patches to 2.0 from 1.2.
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?
Re: Applying patches to 2.0 from 1.2.
Posted by Mike Kienenberger <mk...@gmail.com>.
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 <mk...@gmail.com> wrote:
> Ok. That works :-)
>
>
> On 8/16/06, Andrus Adamchik <an...@objectstyle.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?
> > >
> >
> >
>
Re: Applying patches to 2.0 from 1.2.
Posted by Mike Kienenberger <mk...@gmail.com>.
Ok. That works :-)
On 8/16/06, Andrus Adamchik <an...@objectstyle.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?
> >
>
>
Re: Applying patches to 2.0 from 1.2.
Posted by Andrus Adamchik <an...@objectstyle.org>.
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?
>