You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Vincent Lefevre <vi...@vinc17.org> on 2004/02/12 11:32:33 UTC
Subversion upgrade and $Id$ keyword changes
I've just upgraded Subversion from 0.33 to 0.37, did the dump / load
cycle and checked out a new working copy. I've noticed that some of
the $Id$ keywords have been modified. For instance:
diff -r -x '\.svn' wd.bak/mpfr/web/0_ALIRE wd/mpfr/web/0_ALIRE
8c8
< $Id: 0_ALIRE 1769 2003-11-21 14:08:50Z lefevre $
---
> $Id: 0_ALIRE 1115 2003-09-22 11:49:28Z lefevre $
diff -r -x '\.svn' wd.bak/oldtests/tools/Makefile wd/oldtests/tools/Makefile
26c26
< # $Id: Makefile 1932 2003-12-05 15:21:42Z lefevre $
---
> # $Id: Makefile 2031 2003-12-17 15:32:53Z lefevre $
It seems that a file copy is no longer regarded as a modification
and that a modification of properties (at least svn:mime-type) is
now regarded as a modification. But nothing is said about that in
the changelog. Is it normal or is there a bug?
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion upgrade and $Id$ keyword changes
Posted by Vincent Lefevre <vi...@vinc17.org>.
On 2004-02-12 12:32:33 +0100, Vincent Lefevre wrote:
> diff -r -x '\.svn' wd.bak/oldtests/tools/Makefile wd/oldtests/tools/Makefile
> 26c26
> < # $Id: Makefile 1932 2003-12-05 15:21:42Z lefevre $
> ---
> > # $Id: Makefile 2031 2003-12-17 15:32:53Z lefevre $
I don't know if this is a consequence of this problem, but...
On the working copy I've checked out earlier today:
ay:~/wd/oldtests/tools> svn st -u
Status against revision: 2522
ay:~/wd/oldtests/tools> svn info Makefile
Path: Makefile
Name: Makefile
URL: file:///home/lefevre/svn/oldtests/tools/Makefile
Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
Revision: 2522
Node Kind: file
Schedule: normal
Last Changed Author: lefevre
Last Changed Rev: 2031
Last Changed Date: 2003-12-17 16:32:53 +0100 (Wed, 17 Dec 2003)
Text Last Updated: 2004-02-12 12:12:17 +0100 (Thu, 12 Feb 2004)
Properties Last Updated: 2004-02-12 12:12:17 +0100 (Thu, 12 Feb 2004)
Checksum: 155d8d1074b625983e554c1d7c6cf3ec
ay:~/wd/oldtests/tools> grep Id Makefile
# $Id: Makefile 2031 2003-12-17 15:32:53Z lefevre $
This seems to be correct. Now, on an older working copy:
greux:~/oldtests/tools> svn st -u
Status against revision: 2522
greux:~/oldtests/tools> svn info Makefile
Path: Makefile
Name: Makefile
URL: svn+ssh://home/home/lefevre/svn/oldtests/tools/Makefile
Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
Revision: 2522
Node Kind: file
Schedule: normal
Last Changed Author: lefevre
Last Changed Rev: 2031
Last Changed Date: 2003-12-17 16:32:53 +0100 (Wed, 17 Dec 2003)
Text Last Updated: 2003-12-05 16:21:42 +0100 (Fri, 05 Dec 2003)
Properties Last Updated: 2004-01-05 00:02:33 +0100 (Mon, 05 Jan 2004)
Checksum: 155d8d1074b625983e554c1d7c6cf3ec
greux:~/oldtests/tools> grep Id Makefile
# $Id: Makefile 1932 2003-12-05 15:21:42Z lefevre $
This was probably due to a bug in a previous version of Subversion
(perhaps the one that was fixed in r7968?). But there's still a
problem, as "svn revert" doesn't restore the file to its correct
$Id$ value:
greux:~/oldtests/tools> svn revert Makefile
greux:~/oldtests/tools> grep Id Makefile
# $Id: Makefile 1932 2003-12-05 15:21:42Z lefevre $
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Inconsistent expansion of the $Id$ keyword
Posted by Vincent Lefevre <vi...@vinc17.org>.
On 2004-02-12 17:55:49 +0000, Philip Martin wrote:
> Yes, that looks like a bug. I seem to remember that commit had a
> similar problem in the past. I don't know if there is an existing
> issue to cover this,
I didn't find one (only one concerning another problem I mentioned,
concerning "svn revert" and keyword expansions).
> if not then please raise one.
Done. -> Issue 1743. I've also mentioned the similar problem with
"svn move, then update the second WC"; I hope this is clear enough.
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Inconsistent expansion of the $Id$ keyword
Posted by Philip Martin <ph...@codematters.co.uk>.
Vincent Lefevre <vi...@vinc17.org> writes:
> All the steps were there, but this should be clearer:
[...]
> greux:~tmp/wd2> svn up
> U file
> Updated to revision 2.
> greux:~tmp/wd2> cat file
> $Id: file 1 2004-02-12 17:39:44Z lefevre $
>
> -> The Id lines are different though both copies are up-to-date.
Yes, that looks like a bug. I seem to remember that commit had a
similar problem in the past. I don't know if there is an existing
issue to cover this, if not then please raise one.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Inconsistent expansion of the $Id$ keyword
Posted by Vincent Lefevre <vi...@vinc17.org>.
On 2004-02-12 17:26:18 +0000, Philip Martin wrote:
> Vincent Lefevre <vi...@vinc17.org> writes:
>
> > OK, I can now see the problem
>
> It would help if you put all the steps to reproduce the problem into a
> single email. At present I have difficulty even determining what you
> think goes wrong.
All the steps were there, but this should be clearer:
greux:~tmp> svnadmin create svn
greux:~tmp> svn co file:///home/lefevre/tmp/svn wd1
Checked out revision 0.
greux:~tmp> cd wd1
greux:~tmp/wd1> echo '$Id$' > file
greux:~tmp/wd1> svn add file
A file
greux:~tmp/wd1> svn propset svn:keywords Id file
property 'svn:keywords' set on 'file'
greux:~tmp/wd1> svn commit -m add
Adding file
Transmitting file data .
Committed revision 1.
greux:~tmp/wd1> cd ..
greux:~tmp> svn co file:///home/lefevre/tmp/svn wd2
A wd2/file
Checked out revision 1.
greux:~tmp> cd wd1
greux:~tmp/wd1> svn ps svn:mime-type text/plain file
property 'svn:mime-type' set on 'file'
greux:~tmp/wd1> svn commit -m mime-type
Sending file
Committed revision 2.
greux:~tmp/wd1> cat file
$Id: file 2 2004-02-12 17:40:58Z lefevre $
greux:~tmp/wd1> cd ../wd2
greux:~tmp/wd2> svn up
U file
Updated to revision 2.
greux:~tmp/wd2> cat file
$Id: file 1 2004-02-12 17:39:44Z lefevre $
-> The Id lines are different though both copies are up-to-date.
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Inconsistent expansion of the $Id$ keyword
Posted by Philip Martin <ph...@codematters.co.uk>.
Vincent Lefevre <vi...@vinc17.org> writes:
> OK, I can now see the problem
It would help if you put all the steps to reproduce the problem into a
single email. At present I have difficulty even determining what you
think goes wrong.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Inconsistent expansion of the $Id$ keyword
Posted by Vincent Lefevre <vi...@vinc17.org>.
OK, I can now see the problem (not directly related to the Subversion
upgrade). I added a svn:mime-type to some file 0_ALIRE. After the
commit:
greux:~/wd/mpfr/web> grep Id 0_ALIRE
$Id: 0_ALIRE 2523 2004-02-12 16:09:22Z lefevre $
greux:~/wd/mpfr/web> svn info 0_ALIRE
Path: 0_ALIRE
Name: 0_ALIRE
URL: svn+ssh://home/home/lefevre/svn/mpfr/web/0_ALIRE
Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
Revision: 2523
Node Kind: file
Schedule: normal
Last Changed Author: lefevre
Last Changed Rev: 2523
Last Changed Date: 2004-02-12 17:09:22 +0100 (Thu, 12 Feb 2004)
Text Last Updated: 2004-02-12 17:09:22 +0100 (Thu, 12 Feb 2004)
Properties Last Updated: 2004-02-12 15:47:06 +0100 (Thu, 12 Feb 2004)
Checksum: 1bf8913f63be59f8be7286d6f9efb48c
Then I updated another working copy, but the $Id$ keyword wasn't
updated:
ay:~/wd/mpfr/web> grep Id 0_ALIRE
$Id: 0_ALIRE 1115 2003-09-22 11:49:28Z lefevre $
ay:~/wd/mpfr/web> svn info 0_ALIRE
Path: 0_ALIRE
Name: 0_ALIRE
URL: file:///home/lefevre/svn/mpfr/web/0_ALIRE
Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
Revision: 2523
Node Kind: file
Schedule: normal
Last Changed Author: lefevre
Last Changed Rev: 2523
Last Changed Date: 2004-02-12 17:09:22 +0100 (Thu, 12 Feb 2004)
Text Last Updated: 2004-02-12 12:12:34 +0100 (Thu, 12 Feb 2004)
Properties Last Updated: 2004-02-12 17:09:53 +0100 (Thu, 12 Feb 2004)
Checksum: 1bf8913f63be59f8be7286d6f9efb48c
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion upgrade and $Id$ keyword changes
Posted by Vincent Lefevre <vi...@vinc17.org>.
On 2004-02-12 09:27:47 -0500, John Peacock wrote:
> Vincent Lefevre wrote:
> >ay:~/wd> svn info www-new/contents/yp17/yp17.css
> >Path: www-new/contents/yp17/yp17.css
> >Name: yp17.css
> >URL: file:///home/lefevre/svn/www-new/contents/yp17/yp17.css
> >Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
> >Revision: 2522
> >Node Kind: file
> >Schedule: normal
> >Last Changed Author: lefevre
> >Last Changed Rev: 2121
> >Last Changed Date: 2003-12-28 23:18:07 +0100 (Sun, 28 Dec 2003)
> >Text Last Updated: 2004-02-12 12:12:47 +0100 (Thu, 12 Feb 2004)
> >Properties Last Updated: 2004-02-12 12:12:47 +0100 (Thu, 12 Feb 2004)
> >Checksum: 7fc568de299a16c1354ba96927b934e8
>
> This, however, is based on the information in the WC.
Yes, but this was just after a "svnadmin load", so that the WC was
up-to-date (rev. 2522).
> >IMHO, the last changed revision should be the same as the last
> >revision in the log.
>
> If you do an 'svn up' I believe you will discover that the last changed
> will be displayed as 2280. Could you confirm that?
A "svn up" didn't change anything.
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion upgrade and $Id$ keyword changes
Posted by John Peacock <jp...@rowman.com>.
Vincent Lefevre wrote:
> At least, "svn log" behaves more consistenly:
>
> ay:~/wd> svn log -q -r2000:HEAD www-new/contents/yp17/yp17.css
> ------------------------------------------------------------------------
> r2121 | lefevre | 2003-12-28 23:18:07 +0100 (Sun, 28 Dec 2003)
> ------------------------------------------------------------------------
> r2280 | lefevre | 2004-01-17 18:03:30 +0100 (Sat, 17 Jan 2004)
> ------------------------------------------------------------------------
The log is based on the information in the repository.
> ay:~/wd> svn info www-new/contents/yp17/yp17.css
> Path: www-new/contents/yp17/yp17.css
> Name: yp17.css
> URL: file:///home/lefevre/svn/www-new/contents/yp17/yp17.css
> Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
> Revision: 2522
> Node Kind: file
> Schedule: normal
> Last Changed Author: lefevre
> Last Changed Rev: 2121
> Last Changed Date: 2003-12-28 23:18:07 +0100 (Sun, 28 Dec 2003)
> Text Last Updated: 2004-02-12 12:12:47 +0100 (Thu, 12 Feb 2004)
> Properties Last Updated: 2004-02-12 12:12:47 +0100 (Thu, 12 Feb 2004)
> Checksum: 7fc568de299a16c1354ba96927b934e8
This, however, is based on the information in the WC.
>
> IMHO, the last changed revision should be the same as the last
> revision in the log.
>
If you do an 'svn up' I believe you will discover that the last changed will be
displayed as 2280. Could you confirm that?
John
--
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion upgrade and $Id$ keyword changes
Posted by Vincent Lefevre <vi...@vinc17.org>.
On 2004-02-12 12:32:33 +0100, Vincent Lefevre wrote:
> It seems that a file copy is no longer regarded as a modification
> and that a modification of properties (at least svn:mime-type) is
> now regarded as a modification. But nothing is said about that in
> the changelog. Is it normal or is there a bug?
After looking at that more closely, there is a big inconsistency IMHO.
If the file itself was copied, the last-changed-rev is updated. But if
the file was in a copied directory, the last-changed-rev is no longer
updated. Shouldn't a copy of some directory be somewhat equivalent to
a copy of its contents?
At least, "svn log" behaves more consistenly:
ay:~/wd> svn log -q -r2000:HEAD www-new/contents/yp17/yp17.css
------------------------------------------------------------------------
r2121 | lefevre | 2003-12-28 23:18:07 +0100 (Sun, 28 Dec 2003)
------------------------------------------------------------------------
r2280 | lefevre | 2004-01-17 18:03:30 +0100 (Sat, 17 Jan 2004)
------------------------------------------------------------------------
ay:~/wd> svn info www-new/contents/yp17/yp17.css
Path: www-new/contents/yp17/yp17.css
Name: yp17.css
URL: file:///home/lefevre/svn/www-new/contents/yp17/yp17.css
Repository UUID: 99759db8-4ec0-0310-8bf9-df86780d22d8
Revision: 2522
Node Kind: file
Schedule: normal
Last Changed Author: lefevre
Last Changed Rev: 2121
Last Changed Date: 2003-12-28 23:18:07 +0100 (Sun, 28 Dec 2003)
Text Last Updated: 2004-02-12 12:12:47 +0100 (Thu, 12 Feb 2004)
Properties Last Updated: 2004-02-12 12:12:47 +0100 (Thu, 12 Feb 2004)
Checksum: 7fc568de299a16c1354ba96927b934e8
IMHO, the last changed revision should be the same as the last
revision in the log.
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/> - 100%
validated (X)HTML - Acorn Risc PC, Yellow Pig 17, Championnat International
des Jeux Mathématiques et Logiques, TETRHEX, etc.
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org