Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-1474

cvs2svn ignores revision 1.1.1.1, using the false assumption that 1.1.1.1 == 1.1

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Blocker
    • Resolution: Duplicate
    • Affects Version/s: all
    • Fix Version/s: cvs2svn-1.0
    • Component/s: tools
    • Labels:
      None

      Description

      cvs2svn says:
      # The first revision on a vendor branch is always the same as
      # the revision from which the branch sprouts, e.g., 1.1.1.1 is
      # always the same as 1.1, so there's no need to further modify
      # 1.1.1.1 from however it is in the copy from 1.1.
      
      This is false. Example:
      
      1) Add+commit a file normally
      2) Import a file of the same name
      There is no guarantee that these were identical
      
      Or, more rigourously:
      
      mkdir testroot
      cd testroot
      export CVSROOT=`pwd`/testrepo
      cvs init
      cvs co -d testwc -l .
      cd testwc
      mkdir foo
      cvs add foo
      cd foo
      echo "Hello" > foo
      cvs add foo
      cvs ci -m.
      mkdir tmp
      cd tmp
      echo "Goodbye" > foo
      cvs import -m. foo VENDOR IMPORT1
      cd ..
      cvs co -p -r 1.1 foo/foo
      cvs co -p -r 1.1.1.1 foo/foo
      cd ../..
      cvs2svn --dump-only testrepo
      fgrep Goodbye cvs2svn-dump
      # Look! Contents of rev 1.1.1.1 are not in dumpfile!
      
      Probably, the solution is to just rip out the special-casing of the
      first revision on vendor branches.
      

        Attachments

        1. 1_1474-vendor-assumption.patch
          3 kB
          Max Oliver Bowsher

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                maxb Max Oliver Bowsher
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: