You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Vincent Lefevre <vi...@vinc17.net> on 2015/06/17 10:38:23 UTC
keywords not updated after an update that doesn't change the file
due to local changes
I have the following problem under Debian with the subversion 1.8.13-1
Debian package, but I don't think that this is Debian specific.
It seems that "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.
--
Vincent Lefèvre <vi...@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
Re: keywords not updated after an update that doesn't change the file
due to local changes
Posted by Julian Foad <ju...@btopenworld.com>.
Vincent Lefevre wrote:
> On 2015-06-23 11:04:24 +0200, Julian Foad wrote:
> > On 23 June 2015 at 10:45, Julian Foad <ju...@btopenworld.com>
> wrote:
> > > Vincent Lefevre wrote:
> > >> I have the following problem under Debian with the subversion 1.8.13-1
> > >> Debian package, but I don't think that this is Debian specific.
> > >>
> > >> It seems that "svn update" doesn't update keywords when the local
> > >> modifications on the concerned file are the same as in the repository.
> > > [...]
> > >
> > > Thank you, Vincent.
> >
> > Please feel free to file an issue to track this if you wish.
>
> Done here:
> http://subversion.tigris.org/issues/show_bug.cgi?id=4585
>
Thanks, Vincent!
Now, anybody want to take a shot at fixing it?
- Julian
Re: keywords not updated after an update that doesn't change the
file due to local changes
Posted by Vincent Lefevre <vi...@vinc17.net>.
On 2015-06-23 11:04:24 +0200, Julian Foad wrote:
> On 23 June 2015 at 10:45, Julian Foad <ju...@btopenworld.com> wrote:
> > Vincent Lefevre wrote:
> >> I have the following problem under Debian with the subversion 1.8.13-1
> >> Debian package, but I don't think that this is Debian specific.
> >>
> >> It seems that "svn update" doesn't update keywords when the local
> >> modifications on the concerned file are the same as in the repository.
> > [...]
> >
> > Thank you, Vincent.
>
> Please feel free to file an issue to track this if you wish.
Done here:
http://subversion.tigris.org/issues/show_bug.cgi?id=4585
--
Vincent Lefèvre <vi...@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
Re: keywords not updated after an update that doesn't change the file
due to local changes
Posted by Julian Foad <ju...@btopenworld.com>.
Here's the revision
On 23 June 2015 at 10:45, Julian Foad <ju...@btopenworld.com> wrote:
> Vincent Lefevre wrote:
>> I have the following problem under Debian with the subversion 1.8.13-1
>> Debian package, but I don't think that this is Debian specific.
>>
>> It seems that "svn update" doesn't update keywords when the local
>> modifications on the concerned file are the same as in the repository.
> [...]
>
> Thank you, Vincent.
Please feel free to file an issue to track this if you wish.
(Generally I think it's a good idea to file issues for bugs that are
found in released versions.)
> I can reproduce this in trunk@head and have added a regression test in r1686988.
The commit:
http://svn.apache.org/viewvc?view=revision&revision=r1686988
The test:
XFAIL: update_tests.py 81: update_keywords_on_shortcut
BTW, I imagine fixing it should not be very difficult, but I am not
currently working on it. Does anyone else want to take it?
- Julian
> I noticed that the keywords are correctly updated if I run "svn switch
> ^/FILE FILE" instead of "svn update FILE". I discussed with philipm
> and stsp.This is (we suppose) because a previous, similar bug in
> 'switch' was fixed by making switch run a full WC crawl (after the
> incoming changes have been processed) to update any keywords (URL
> keywords, especially) in files that were not touched by the incoming
> changes. That fix probably has the unintended side effect of masking
> this present bug. I haven't checked to see if that is definitely the
> reason why 'switch' works.
>
> - Julian
Re: keywords not updated after an update that doesn't change the file
due to local changes
Posted by Julian Foad <ju...@btopenworld.com>.
Vincent Lefevre wrote:
> I have the following problem under Debian with the subversion 1.8.13-1
> Debian package, but I don't think that this is Debian specific.
>
> It seems that "svn update" doesn't update keywords when the local
> modifications on the concerned file are the same as in the repository.
[...]
Thank you, Vincent.
I can reproduce this in trunk@head and have added a regression test in r1686988.
I noticed that the keywords are correctly updated if I run "svn switch
^/FILE FILE" instead of "svn update FILE". I discussed with philipm
and stsp.This is (we suppose) because a previous, similar bug in
'switch' was fixed by making switch run a full WC crawl (after the
incoming changes have been processed) to update any keywords (URL
keywords, especially) in files that were not touched by the incoming
changes. That fix probably has the unintended side effect of masking
this present bug. I haven't checked to see if that is definitely the
reason why 'switch' works.
- Julian