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

Merge causes file property changes

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Invalid
    • Affects Version/s: 1.6.x
    • Fix Version/s: ---
    • Component/s: contrib/svnmerge.py
    • Labels:
      None
    • Environment:

      Windows 7

      Description

      I merged some changes of *.c files into my working copy.
      After this I checked the changes by svn stat and got file property changes of
      other files.
      
      
      
      Command History of my working copy:
      
      
      
      
      C:\develop\p100u\classic>svn update
      At revision 1341.
      
      
      C:\develop\p100u\classic>svn stat
      
      
      C:\develop\p100u\classic>svn merge -c1340 http://mysvnurl/svn/its/trunk/classic/
      --- Merging r1340 into '.':
      U    shared\sys\calimp.c
      U    shared\sys\itconobj.c
      U    shared\sys\itbefobj.c
      
      
      C:\develop\p100u\classic>svn stat
       M      .
      M       shared\sys\calimp.c
       M      bg\src\stat\10\cbgstat.cmd
       M      dbc
       M      build.rcb
      M       shared\sys\itconobj.c
      M       shared\sys\itbefobj.c
      

      Original issue reported by agj

        Attachments

          Activity

            People

            • Assignee:
              blair Blair Zajac
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: