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-05, 14:09
Hi,

> https://issues.apache.org/jira/browse/HADOOP-7076
> >
> > Jenkins has just completed.
> > Although it passed everything else it was '-1' because of 9 javadoc
> > warnings that do not seem related to my patch.
> >
> >
> https://builds.apache.org/job/PreCommit-HADOOP-Build/432/artifact/trunk/hadoop-common-project/patchprocess/patchJavadocWarnings.txt
>
> Yea, these are not due to your patch. I'll bump the javadoc warnings
> in test-patch.properties.
Thanks.

> >>> 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).
>
> > Do I simply make separate Jira (related) issues for these backports?
>
> Nope, just set the "target version" field to the appropriate version
> and uploaded a patch, eg hadoop-7076-branch-1.patch.
>

So that I understand correctly:
- I add the targets to the Jira issue for each branch specific patch.
- I create a new patch file for each version I want the feature to appear
in and attach these to the issue.
- I name these patches something like <issue id>-<date>-<branchid>.patch so
that the committer can clearly see what it was intended for.

Do I have to do something to ensure Jenkins will accept this all correctly?
Perhaps in naming convention? Or in the timing between uploading the
various patches?

--
Best regards / Met vriendelijke groeten,

Niels Basjes