Bug#356900: subversion: removing property svn:keywords leaves an expanded keyword in the WC

[Christof Douma]

Package: subversion
Version: 1.2.3dfsg1-3
Severity: normal

Let's explain this by example:

Create a file with the $Id$ keyword and make svn expand it:

~$ svnadmin create $HOME/repos
~$ svn co file://$HOME/repos wc1
~$ cd wc1
~/wc1$ echo '$Id$' > test
~/wc1$ svn add test
~/wc1$ svn ps svn:keywords Id test
~/wc1$ svn ci -m 'added test'

let's first check that all is ok:

~/wc1$ cat test
$Id: test 1 2006-03-14 14:14:09Z wizztick $
~/wc1$ svn cat file://$HOME/repos/test
$Id: test 1 2006-03-14 14:14:09Z wizztick $

All ok, but I did not want the keyword afterall, let's remove it again:

~/wc1$ svn pd svn:keywords test
~/wc1$ svn ci -m 'removed prop svn:keywords'
~/wc1$ cat test
$Id: test 1 2006-03-14 14:14:09Z wizztick $
~/wc1$ svn cat file://$HOME/repos/test
$Id$
~/wc1$ svn st
~/wc1$ svn diff

No changes!!!??? I see a difference between the local and repository
version!

~/wc1$ touch test
~/wc1$ svn st
M      test
~/wc1$ svn diff
Index: test
===================================================================
--- test        (revision 2)
+++ test        (working copy)
@@ -1 +1 @@
-$Id$
+$Id: test 1 2006-03-14 14:14:09Z wizztick $

ok, this is what I expected.

Without this touch svn does not record any changes, which should not
happen. A quick fix would be to touch all WC files which have
svn:keywords changed/removed. A better fix would be to undo the
expansion of the keywords:

- on commit use svn:keywords property in BASE to remove expanded
  keywords (already happens?)
- on update use svn:keyword in BASE to undo the expansion (before BASE
  is updated) and use the new svn:keywords property to expand again

I hope I made the bug clear.

cheers,
Christof


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686-smp
Locale: LANG=nl_NL.UTF-8, LC_CTYPE=nl_NL.UTF-8 (charmap=UTF-8)

Versions of packages subversion depends on:
ii  db4.3-util                 4.3.29-4      Berkeley v4.3 Database Utilities
ii  libapr0                    2.0.55-4      the Apache Portable Runtime
ii  libc6                      2.3.6-3       GNU C Library: Shared libraries an
ii  libneon24                  0.24.7.dfsg-3 An HTTP and WebDAV client library
ii  libsvn0                    1.2.3dfsg1-3  shared libraries used by Subversio
ii  patch                      2.5.9-4       Apply a diff file to an original

subversion recommends no packages.

-- no debconf information