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

Switch to Threaded View
HDFS >> 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


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
Got it. Thanks Nicholas!

Although I still find it intriguing that it is always a constant set
of paths that "track" svn:mergeinfo stuff. Perhaps a property needs to
be unset on them. My SVN-fu isn't very strong to know what exactly is
the issue though.

On Fri, Mar 23, 2012 at 11:31 PM, Tsz Wo Sze <[EMAIL PROTECTED]> wrote:
> 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)

Harsh J