Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Threaded View
Hadoop, mail # dev - Which branch for my patch?


Copy link to this message
-
Re: Which branch for my patch?
Niels Basjes 2011-12-06, 21:54
I got this:

Hadoop QA commented on HADOOP-7076:
-1 overall.  Here are the results of testing the latest attachment

http://issues.apache.org/jira/secure/attachment/12506182/HADOOP-7076-branch-0.22.patch
  against trunk revision .
...
-1 patch.  The patch command could not apply the patch.

Did I do something wrong in the patch I created for branch-0.22?
Or is HADOOP-7435 not yet operational?

Thanks.

Niels Basjes
On Tue, Dec 6, 2011 at 00:17, Niels Basjes <[EMAIL PROTECTED]> wrote:

> Hi,
>
> On Mon, Dec 5, 2011 at 18:54, Eli Collins <[EMAIL PROTECTED]> wrote:
>
>> >> https://issues.apache.org/jira/browse/HADOOP-7076
>>
>
>
>> >> >>> Your patch based on the old structure would be useful for
>> backporting
>> >> >>> this feature from trunk to a release with the old structure (eg
>> 1.x,
>> >> >>> 0.22). To request inclusion in a 1.x release set the target
>> version to
>> >> >>> 1.1.0 (and generate a patch against branch-1). To request
>> inclusion in
>> >> >>> 0.22 set target version to 0.22.0 (and generate a patch against
>> >> >>> branch-0.22).
>>
>
> Turns out my changes are not trivial to backport to branch-1 because the
> SplittableCompressionCodec interface isn't there yet.
> So I'm limiting to trunk (0.23.1) and branch-0.22 (0.22.0).
>
> ...
>
>
> >Unfortunately jenkins doesn't currently run tests against non-trunk
> >trees.  For these branches you need to run test-patch (covered in the
> >above page) and the tests yourself.
>
> Unfortunately the test-patch script mentioned on the site
> ("dev-support/test-patch.sh /path/to/my.patch") doesn't exist in the
> branch-0.22. And I couldn't get the test-patch.sh that does exist to work.
>
> So I did against a clean checkout:
>   patch -p0 < HADOOP-7076-branch-0.22.patch
> followed by
>   ant clean test jar
>
> Which succeeded.
>
>
> --
> Best regards / Met vriendelijke groeten,
>
> Niels Basjes
>

--
Best regards / Met vriendelijke groeten,

Niels Basjes