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

update fails when file with local mods is moved and modified

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.6.0
    • Component/s: unknown
    • Labels:
      None

      Description

      From http://svn.haxx.se/dev/archive-2009-01/0075.shtml
      
      If you run the attached script with current trunk, svn bails out
      and leaves the working copy in locked state.
      
      The problem occurs when an update pulls down both a move and a
      textual diff for a file in one go.
      
      This is what I'm seeing:
      
        + svn update recipe/trunk2
           C recipe/trunk2/alpha
        Conflict discovered in 'recipe/trunk2/alpha.moved'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    recipe/trunk2/alpha.moved
        subversion/libsvn_wc/log.c:625: (apr_err=155009)
        svn: In directory 'recipe/trunk2'
        subversion/libsvn_subr/io.c:2637: (apr_err=2)
        svn: Can't open file 'recipe/trunk2/alpha.moved': No such file or directory
        $ svn st recipe/trunk2
        ! L     recipe/trunk2
        ?       recipe/trunk2/alpha.moved.copied
        ?       recipe/trunk2/alpha.moved.r3
        ?       recipe/trunk2/alpha.moved.mine
        A  +  C recipe/trunk2/alpha
              >   local edit, incoming delete upon update
        $ ls -1 recipe/trunk2/
        alpha
        alpha.moved.copied
        alpha.moved.mine
        alpha.moved.r3
      

      http://svn.haxx.se/dev/archive-2009-01/0075.shtml

        Attachments

        1. 1_recipe.sh
          0.9 kB
          Stefan Sperling

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              stsp Stefan Sperling
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: