subversion-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ivan Zhakov (JIRA)" <j...@apache.org>
Subject [jira] [Updated] (SVN-4585) keywords not updated after an update that doesn't change the file due to local changes
Date Thu, 01 Oct 2015 18:01:27 GMT

     [ https://issues.apache.org/jira/browse/SVN-4585?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Ivan Zhakov updated SVN-4585:
-----------------------------
    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:
# Do 2 checkout's of the repository, where there's some file "foo" has an Id keyword. ->
wc1 and wc2.
# In wc1, modify file "foo".
# In wc1, do "svn commit".
# In wc2, do the same modification.
# 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


  was:
{noformat:nopanel=true}
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
{noformat}


> keywords not updated after an update that doesn't change the file due to local changes
> --------------------------------------------------------------------------------------
>
>                 Key: SVN-4585
>                 URL: https://issues.apache.org/jira/browse/SVN-4585
>             Project: Subversion
>          Issue Type: Bug
>          Components: libsvn_wc
>    Affects Versions: 1.8.x
>            Reporter: Vincent Lefevre
>             Fix For: ---
>
>
> 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:
> # Do 2 checkout's of the repository, where there's some file "foo" has an Id keyword.
-> wc1 and wc2.
> # In wc1, modify file "foo".
> # In wc1, do "svn commit".
> # In wc2, do the same modification.
> # 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



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message