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

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

This comes up when an svn merge command itself is carried out.

The particular list of files actually is always the same. It may be
that these files are set to track mergeinfo or something (Maybe
someone touched them long ago with a different version of svn?).

What version of svn do you use Nicholas? Do you not see this when you
run the "svn merge -c <commit> /path/to/trunk ." command?

On Fri, Mar 23, 2012 at 4:16 AM, 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)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job/ (props changed)
>
> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/
> ------------------------------------------------------
Harsh J

Tsz Wo Sze 2012-03-23, 18:01

Hi Harsh,

$svn --version
svn, version 1.6.17 (r1128011)
compiled Nov 8 2011, 18:14:46
I think the version is irrelevant. You have to merge under the sub-project directory, i.e. "svn merge -c <commit> /path/to/trunk/hadoop-hdfs-project/hadoop-hdfs .", provided that all the changes are that sub-directory.

Regards,
Nicholas

----- Original Message -----
From: Harsh J <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]; Tsz Wo Sze <[EMAIL PROTECTED]>
Cc: hdfs dev <[EMAIL PROTECTED]>
Sent: Thursday, March 22, 2012 9:45 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

This comes up when an svn merge command itself is carried out.

The particular list of files actually is always the same. It may be
that these files are set to track mergeinfo or something (Maybe
someone touched them long ago with a different version of svn?).

What version of svn do you use Nicholas? Do you not see this when you
run the "svn merge -c <commit> /path/to/trunk ." command?

On Fri, Mar 23, 2012 at 4:16 AM, 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)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ (props changed)

Harsh J

Todd Lipcon 2012-03-22, 22:49

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)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job/ (props changed)
>
> Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/
> ------------------
Todd Lipcon
Software Engineer, Cloudera

Tsz Wo Sze 2012-03-22, 23:32

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. 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.
Beside this related subject, do you think that my previous comment make sense?
Regards,
Nicholas

----- 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)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ (props changed)
> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed)

Todd Lipcon
Software Engineer, Cloudera

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

Works for me. How about we check a merge script into the repo so we
all do merges the same way?

On Thu, Mar 22, 2012 at 3:49 PM, Todd Lipcon <[EMAIL PROTECTED]> wrote:
> 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)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ (props changed)

Tsz Wo Sze 2012-03-22, 23:38

Hi Eli,
Checking in a script to me seems unnecessary since the svn command is already simple. It just likes that we don't check in a script for committing patches. We already have a wiki (http://wiki.apache.org/hadoop/HowToCommit) for committing and merging.

I am not sure if you are replying my email. Does my previous comment make sense to you?

Regards,
Nicholas

----- Original Message -----
From: Eli Collins <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]; Tsz Wo Sze <[EMAIL PROTECTED]>
Sent: Thursday, March 22, 2012 4:12 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

Works for me. How about we check a merge script into the repo so we
all do merges the same way?

On Thu, Mar 22, 2012 at 3:49 PM, Todd Lipcon <[EMAIL PROTECTED]> wrote:
> 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)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
>> hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)

Eli Collins 2012-03-22, 23:49

On Thu, Mar 22, 2012 at 4:38 PM, Tsz Wo Sze <[EMAIL PROTECTED]> wrote:
> Hi Eli,
>
>
> Checking in a script to me seems unnecessary since the svn command is already simple. It just likes that we don't check in a script for committing patches. We already have a wiki (http://wiki.apache.org/hadoop/HowToCommit) for committing and merging.

The point of the command is not because svn merge is complicated but
to standardize the commit message. Eg mine below echos the commit
message to stdout which I just past into the commit. If we all did
this we'd all get the same message.

function svn_merge_apache ()
{
  BRANCH=$1
  REV=$2
  JIRA=$3
  svn merge -c $REV https://svn.apache.org/repos/asf/hadoop/$BRANCH/trunk
  echo "$JIRA. svn merge -c $REV from trunk"
}

>
> I am not sure if you are replying my email. Does my previous comment make sense to you?
>

Yup.

Thanks,
Eli

> Regards,
> Nicholas
>
>
>
> ----- Original Message -----
> From: Eli Collins <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Cc: [EMAIL PROTECTED]; Tsz Wo Sze <[EMAIL PROTECTED]>
> Sent: Thursday, March 22, 2012 4:12 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
>
> Works for me. How about we check a merge script into the repo so we
> all do merges the same way?
>
> On Thu, Mar 22, 2012 at 3:49 PM, Todd Lipcon <[EMAIL PROTECTED]> wrote:
>> 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)

Todd Lipcon 2012-03-23, 00:21

On Thu, Mar 22, 2012 at 5:03 PM, Owen O'Malley <[EMAIL PROTECTED]> wrote:
> To me, I'd much much rather have the human readable description of what is
> being fixed and I mostly could care less about which subversion commit it
> corresponds to. I'd be all for using the CHANGE.txt description as the
> commit message for both trunk and the branches.

+1. I never even use the svn merge command to merge between branches.
I just apply the patch separately to each branch. The svn metadata on
single-patch merges seems pretty much useless, best I can tell.

-Todd
--
Todd Lipcon
Software Engineer, Cloudera

Tsz Wo Sze 2012-03-22, 22:46

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)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job/ (props changed)

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/c++:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/
Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1304063

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:r1304063

Propchange: hadoop/common/branches/br