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) > 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/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/ > ------------------------------------------------------------------------------ > Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/examples:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/ > ------------------------------------------------------------------------------ > Merged /hadoop/common/trunk/hadoop-mapreduce-project/src/java:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1304063 > > Propchange: > hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job/ > ------------------------------------------------------------------------------ > Merged > /hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:r1304063 -- Harsh J
