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

svnmerge.py puts a file in a conflicted state although one way hasn't changed (keyword substitution)

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Critical
    • Resolution: Unresolved
    • Affects Version/s: 1.6.x
    • Fix Version/s: nonblocking
    • Component/s: contrib/svnmerge.py
    • Labels:
      None
    • Environment:

      Linux

      Description

      TikiWiki currently has a modules-doc branch with a
      lib/wiki-plugins/wikiplugin_group.php which you can see on
      http://tikiwiki.svn.sourceforge.net/viewvc/tikiwiki/branches/experimental/modules-doc/lib/wiki-plugins/wikiplugin_group.php?view=log
      
      Although wikiplugin_group.php did not change on the branch (since the branch's
      creation), svn merge marks it as conflicted when merging from trunk. Of course,
      svn should just adopt trunk's version, but instead, 2 of the first lines are
      marked as conflicting. I shall remember to attach the resulting file.
      
      I first experienced this problem when running 1.5.6, but I can still reproduce
      with Debian's 1.6.3dfsg-1.
      
      On trunk, only 1 modification happened since the branch's creation. The trick is
      that it changed both the content and the svn:keywords property, from
      "Id"
      to
      Id
      (it was originally broken). The first line marked as conflicted is an Id line -
      so it's keyword substitution that must be confusing svn.
      
      The branches look like this:
      
      $ svn log lib/wiki-plugins/wikiplugin_group.php --stop-on-copy
      ------------------------------------------------------------------------
      r19946 | lphuberdeau | 2009-07-06 08:04:54 -0400 (lun 06 jui 2009) | 1 ligne
      
      [BRANCH] Creation, trunk 0 to 19945
      ------------------------------------------------------------------------
      chealer@vinci:/var/www/tiki/modules-doc$
      
      
      $ svn log -r19945:HEAD lib/wiki-plugins/wikiplugin_group.php
      ------------------------------------------------------------------------
      r20227 | luciash | 2009-07-19 16:03:56 -0400 (dim 19 jui 2009) | 1 ligne
      
      [ENH] Group wikiplugin: new param to allow only friends of specified user(s) to
      view the rendered content
      ------------------------------------------------------------------------
      chealer@vinci:/var/www/tiki/trunk$
      
      
      This should be easy to reproduce:
      
      svn co
      https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/experimental/modules-doc/lib/wiki-plugins/
      cd wiki-plugins/
      svn merge
      https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk/lib/wiki-plugins/
      svn status wikiplugin_group.php
      
      This report is written as of r20289 - I should soon perform the merge anyway.
      After that, make sure to checkout r20289 to see the problem.
      

      http://tikiwiki.svn.sourceforge.net/viewvc/tikiwiki/branches/experimental/modules-doc/lib/wiki-plugins/wikiplugin_group.php?view=log

      Original issue reported by chealer

        Attachments

        1. 1_wikiplugin_group.php
          3 kB
          Subversion Importer

          Activity

            People

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

              Dates

              • Created:
                Updated: