Details

    • Type: Bug Bug
    • Status: Open
    • Priority: Major Major
    • Resolution: Unresolved
    • Affects Version/s: 2.0.0-alpha, 3.0.0
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Target Version/s:

      Description

      TortoiseSVN/some versions of svn have added several mergeinfo props to Hadoop's svn files/dirs (list below).

      We should propdel that unneeded property, and fix it up. This otherwise causes pain to those who backport with a simple root-dir-down command (svn merge -c num <url/path>).

      We should also make sure to update the HowToCommit page on advising to avoid mergeinfo additions to prevent this from reoccurring.

      Files affected are, from my propdel revert output earlier today:

      Reverted '.'
      Reverted 'hadoop-hdfs-project'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/java'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary'
      Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/native'
      Reverted 'hadoop-mapreduce-project'
      Reverted 'hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site'
      Reverted 'hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt'
      Reverted 'hadoop-mapreduce-project/conf'
      Reverted 'hadoop-mapreduce-project/CHANGES.txt'
      Reverted 'hadoop-mapreduce-project/src/test/mapred'
      Reverted 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs'
      Reverted 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs'
      Reverted 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc'
      Reverted 'hadoop-mapreduce-project/src/contrib'
      Reverted 'hadoop-mapreduce-project/src/contrib/eclipse-plugin'
      Reverted 'hadoop-mapreduce-project/src/contrib/block_forensics'
      Reverted 'hadoop-mapreduce-project/src/contrib/index'
      Reverted 'hadoop-mapreduce-project/src/contrib/data_join'
      Reverted 'hadoop-mapreduce-project/src/contrib/build-contrib.xml'
      Reverted 'hadoop-mapreduce-project/src/contrib/vaidya'
      Reverted 'hadoop-mapreduce-project/src/contrib/build.xml'
      Reverted 'hadoop-mapreduce-project/src/java'
      Reverted 'hadoop-mapreduce-project/src/webapps/job'
      Reverted 'hadoop-mapreduce-project/src/c++'
      Reverted 'hadoop-mapreduce-project/src/examples'
      Reverted 'hadoop-mapreduce-project/hadoop-mapreduce-examples'
      Reverted 'hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml'
      Reverted 'hadoop-mapreduce-project/bin'
      Reverted 'hadoop-common-project'
      Reverted 'hadoop-common-project/hadoop-common'
      Reverted 'hadoop-common-project/hadoop-common/src/test/core'
      Reverted 'hadoop-common-project/hadoop-common/src/main/java'
      Reverted 'hadoop-common-project/hadoop-common/src/main/docs'
      Reverted 'hadoop-common-project/hadoop-auth'
      Reverted 'hadoop-project'
      Reverted 'hadoop-project/src/site'
      

      Proposed set of fix (from http://stackoverflow.com/questions/767418/remove-unnecessary-svnmergeinfo-properties):

      svn propdel svn:mergeinfo -R
      svn revert .
      svn commit -m <appropriate message>
      

      (To be done on branch-2 and trunk both)

        Activity

        Hide
        Eli Collins added a comment -

        Ah, sorry, I missed the "svn revert .". I'm OK with this.

        Show
        Eli Collins added a comment - Ah, sorry, I missed the "svn revert .". I'm OK with this.
        Hide
        Harsh J added a comment -

        Thanks Eli. I am ignoring . from my prop-del per my commands above (I revert . back to its state), will that not cover this?

        Show
        Harsh J added a comment - Thanks Eli. I am ignoring . from my prop-del per my commands above (I revert . back to its state), will that not cover this?
        Hide
        Eli Collins added a comment -

        Won't this nuke the svn md for the 1623 and 3042 merges?

        hadoop-trunk1 $ svn propget svn:mergeinfo .
        /hadoop/common/branches/HDFS-1623:1152502-1296519
        /hadoop/common/branches/HDFS-3042:1306184-1342109

        Show
        Eli Collins added a comment - Won't this nuke the svn md for the 1623 and 3042 merges? hadoop-trunk1 $ svn propget svn:mergeinfo . /hadoop/common/branches/ HDFS-1623 :1152502-1296519 /hadoop/common/branches/ HDFS-3042 :1306184-1342109
        Hide
        Harsh J added a comment -

        Ping?

        Show
        Harsh J added a comment - Ping?
        Hide
        Harsh J added a comment -

        Here's a dry-run on trunk:

        ➜  trunk  svn propdel svn:mergeinfo -R
        property 'svn:mergeinfo' deleted from '.'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/java'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary'.
        property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/native'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/conf'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/CHANGES.txt'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/eclipse-plugin'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/block_forensics'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/index'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/data_join'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/build-contrib.xml'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/vaidya'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/build.xml'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/java'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/webapps/job'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/c++'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/examples'.
        property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml'.
        property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/CHANGES.txt'.
        property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/test/core'.
        property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/main/java'.
        property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/main/docs'.
        svn: Attempting to delete nonexistent property 'svn:mergeinfo'
        ➜  trunk  svn revert .
        Reverted '.'
        ➜  trunk  svn st
         M      hadoop-hdfs-project/hadoop-hdfs
         M      hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
         M      hadoop-hdfs-project/hadoop-hdfs/src/main/java
         M      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
         M      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
         M      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
         M      hadoop-hdfs-project/hadoop-hdfs/src/main/native
         M      hadoop-mapreduce-project
         M      hadoop-mapreduce-project/conf
         M      hadoop-mapreduce-project/CHANGES.txt
         M      hadoop-mapreduce-project/src/test/mapred
         M      hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
         M      hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
         M      hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
         M      hadoop-mapreduce-project/src/contrib
         M      hadoop-mapreduce-project/src/contrib/eclipse-plugin
         M      hadoop-mapreduce-project/src/contrib/block_forensics
         M      hadoop-mapreduce-project/src/contrib/index
         M      hadoop-mapreduce-project/src/contrib/data_join
         M      hadoop-mapreduce-project/src/contrib/build-contrib.xml
         M      hadoop-mapreduce-project/src/contrib/vaidya
         M      hadoop-mapreduce-project/src/contrib/build.xml
         M      hadoop-mapreduce-project/src/java
         M      hadoop-mapreduce-project/src/webapps/job
         M      hadoop-mapreduce-project/src/c++
         M      hadoop-mapreduce-project/src/examples
         M      hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
         M      hadoop-common-project/hadoop-common/CHANGES.txt
         M      hadoop-common-project/hadoop-common/src/test/core
         M      hadoop-common-project/hadoop-common/src/main/java
         M      hadoop-common-project/hadoop-common/src/main/docs
        ➜  trunk  
        

        I'd really like to do this to avoid the silly merge pains I've been enduring.

        Show
        Harsh J added a comment - Here's a dry-run on trunk: ➜ trunk svn propdel svn:mergeinfo -R property 'svn:mergeinfo' deleted from '.'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/java'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary'. property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/ native '. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/conf'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/CHANGES.txt'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/eclipse-plugin'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/block_forensics'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/index'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/data_join'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/build-contrib.xml'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/vaidya'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/build.xml'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/java'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/webapps/job'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/c++'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/examples'. property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred- default .xml'. property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/CHANGES.txt'. property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/test/core'. property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/main/java'. property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/main/docs'. svn: Attempting to delete nonexistent property 'svn:mergeinfo' ➜ trunk svn revert . Reverted '.' ➜ trunk svn st M hadoop-hdfs-project/hadoop-hdfs M hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs M hadoop-hdfs-project/hadoop-hdfs/src/main/java M hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode M hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs M hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary M hadoop-hdfs-project/hadoop-hdfs/src/main/ native M hadoop-mapreduce-project M hadoop-mapreduce-project/conf M hadoop-mapreduce-project/CHANGES.txt M hadoop-mapreduce-project/src/test/mapred M hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs M hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs M hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc M hadoop-mapreduce-project/src/contrib M hadoop-mapreduce-project/src/contrib/eclipse-plugin M hadoop-mapreduce-project/src/contrib/block_forensics M hadoop-mapreduce-project/src/contrib/index M hadoop-mapreduce-project/src/contrib/data_join M hadoop-mapreduce-project/src/contrib/build-contrib.xml M hadoop-mapreduce-project/src/contrib/vaidya M hadoop-mapreduce-project/src/contrib/build.xml M hadoop-mapreduce-project/src/java M hadoop-mapreduce-project/src/webapps/job M hadoop-mapreduce-project/src/c++ M hadoop-mapreduce-project/src/examples M hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred- default .xml M hadoop-common-project/hadoop-common/CHANGES.txt M hadoop-common-project/hadoop-common/src/test/core M hadoop-common-project/hadoop-common/src/main/java M hadoop-common-project/hadoop-common/src/main/docs ➜ trunk I'd really like to do this to avoid the silly merge pains I've been enduring.

          People

          • Assignee:
            Harsh J
            Reporter:
            Harsh J
          • Votes:
            0 Vote for this issue
            Watchers:
            7 Start watching this issue

            Dates

            • Created:
              Updated:

              Development