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

Switch to Plain View
MapReduce, mail # dev - Re: svn commit: r1304067 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/ hadoop-yarn/hadoop-yarn-site/ hadoop-yarn/ha


+
Harsh J 2012-03-23, 04:45
+
Tsz Wo Sze 2012-03-23, 18:01
+
Todd Lipcon 2012-03-22, 22:49
+
Tsz Wo Sze 2012-03-22, 23:32
Copy link to this message
-
Re: svn commit: r1304067 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/ hadoop-yarn/hadoop-yarn-site/ hadoop-yarn/ha
Todd Lipcon 2012-03-22, 23:43
On Thu, Mar 22, 2012 at 4:32 PM, Tsz Wo Sze <[EMAIL PROTECTED]> wrote:
> Hi Todd,
>
> The jira number, svn revision and merge source location should be in the merge-commit message.   It is very easy to find the original commit message or other details.

Sure, for any individual merge commit, you can go back to look at the
corresponding source revision on the other branch. But, if I just run
"git log origin/branch-0.23", it's very hard to quickly skim through
the list of what was committed in the last day or two. For each commit
I have to go to another shell to dig up the original.

>   If you think that there is a need to include the commit message, I don't mind doing it if everyone agree.  One potential problem is that the merge-commit message may be too long.
>

Too long? There's no max length...

>
> Beside this related subject, do you think that my previous comment make sense?
>
Sure.

-Todd

>
> ----- Original Message -----
> From: Todd Lipcon <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]; Tsz Wo Sze <[EMAIL PROTECTED]>
> Cc: hdfs dev <[EMAIL PROTECTED]>
> Sent: Thursday, March 22, 2012 3:49 PM
> Subject: Re: svn commit: r1304067 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/ hadoop-yarn/hadoop-yarn-site/ hadoop-yarn/ha
>
> On a related subject, can I make a request that, when we merge issues,
> we also include the original commit message?
> ie instead of just: "Merging HDFS-12345 from trunk", we say something
> like "Merge HDFS-12345 from trunk: Fix the blah bug." (or just re-use
> the original commit)?
>
> I find it really difficult to follow the log on branch-23 when many of
> the commits just reference JIRA numbers with no further explanation.
>
> -Todd
>
> On Thu, Mar 22, 2012 at 3:46 PM, Tsz Wo Sze <[EMAIL PROTECTED]> wrote:
>> Hi Eli,
>>
>> For merging a HDFS issue, please don't merge COMMON and MAPREDUCE.  It generates useless merge info and emails.  Does it make sense?
>>
>> Regards,
>>
>> Nicholas
>>
>>
>>
>> ________________________________
>>  From: "[EMAIL PROTECTED]" <[EMAIL PROTECTED]>
>> To: [EMAIL PROTECTED]
>> Sent: Thursday, March 22, 2012 2:13 PM
>> Subject: svn commit: r1304067 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/ hadoop-yarn/hadoop-yarn-site/ hadoop-yarn/hadoop-y...
>>
>> Author: eli
>> Date: Thu Mar 22 21:13:18 2012
>> New Revision: 1304067
>>
>> URL: http://svn.apache.org/viewvc?rev=1304067&view=rev
>> Log:
>> HDFS-3044. svn merge -c 1304063 from trunk
>>
>> Modified:
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/   (props changed)
>>     hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml   (props changed)

Todd Lipcon
Software Engineer, Cloudera
+
Eli Collins 2012-03-22, 23:12
+
Tsz Wo Sze 2012-03-22, 23:38
+
Eli Collins 2012-03-22, 23:49
+
Owen OMalley 2012-03-23, 00:03
+
Todd Lipcon 2012-03-23, 00:21
+
Tsz Wo Sze 2012-03-22, 22:46