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

keywords not updated after an update that doesn't change the file due to local changes

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: 1.8.x
    • Fix Version/s: ---
    • Component/s: libsvn_wc
    • Labels:
      None

      Description

      In Subversion 1.8.13, svn update doesn't update keywords when the local modifications on the concerned file are the same as in the repository.

      The problem occurs on something like that:

      1. Do 2 checkout's of the repository, where there's some file "foo" has an Id keyword. -> wc1 and wc2.
      2. In wc1, modify file "foo".
      3. In wc1, do "svn commit".
      4. In wc2, do the same modification.
      5. In wc2, do "svn update".

      At (5), the local changes and the changes from the repository are merged, and the file is unchanged. But the Id keyword should have been updated.

      Reported in the dev list:
      http://mail-archives.apache.org/mod_mbox/subversion-dev/201506.mbox/browser

      Julian added a regression test:
      http://svn.apache.org/viewvc?view=revision&revision=r1686988

      The test:
      XFAIL: update_tests.py 81: update_keywords_on_shortcut

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              vinc17 Vincent Lefevre
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated: