[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problems when using both auto-props and use-commit-times

From: David Budworth <dbudworth_at_eloan.com>
Date: 2004-03-17 22:04:18 CET

Sorry, didn't make the actual issue clear really

There are two issues:

1) When using 'use-commit-times' in your global config, the files are
indeed stamped with the commit time, but 'svn'(client) seems to not
track what the original commit time of the WC files are.
        This results in all 'svn status' invocations to perform a diff between
the WC and the original version. In effect, subversion thinks I've
done the equivilent of 'touch' on all my files, and shows the entire
tree as 'Modified' immediately after a check out.

2) $Id:$ tags are are not properly stripped down during the diff
process.
If I originally put the tag in as "$Id:$" then add / commit my change.
Any one who gets this file via a new checkout / update will always see
the diff as described below.

After reading your response, I realized that you can set the tag as
"$Id$" without the colon, but I would expect that the colon, if
included, would not produce the diff.

below is the output showing the addition of 2 files, one with $Id:$ and
the other with $Id$
(note: the manual, last I checked, doesn't explicitly say to not use
the colon, and i believe CVS requires it's inclusion, so any file
templates people may be using where the colon exists, become an issue
during cvs->subversion migration)

*** BEGIN LOG (extra line added before each prompt for easier reading)
***

[davidb_at_olcit sandbox]$ svn co http://svn/test2
Checked out revision 0.

[davidb@olcit sandbox]$ cd test2

[davidb@olcit test2]$ echo 'File with $Id:$ tag' > id_with_colon.txt

[davidb@olcit test2]$ echo 'File with $Id$ tag' > id_no_colon.txt

[davidb@olcit test2]$ ls
id_no_colon.txt id_with_colon.txt

[davidb@olcit test2]$ svn add *txt
A id_no_colon.txt
A id_with_colon.txt

[davidb@olcit test2]$ svn pset svn:keywords Id *txt
property 'svn:keywords' set on 'id_no_colon.txt'
property 'svn:keywords' set on 'id_with_colon.txt'

[davidb@olcit test2]$ svn commit -m 'added files'
Adding id_no_colon.txt
Adding id_with_colon.txt
Transmitting file data ..
Committed revision 1.

[davidb@olcit test2]$ svn update
At revision 1.

[davidb@olcit test2]$ touch *txt

[davidb@olcit test2]$ svn status
M id_with_colon.txt

[davidb@olcit test2]$ svn diff id_with_colon.txt
Index: id_with_colon.txt
===================================================================
--- id_with_colon.txt (revision 1)
+++ id_with_colon.txt (working copy)
@@ -1 +1 @@
-File with $Id:$ tag
+File with $Id$ tag

[davidb@olcit test2]$ cat id_with_colon.txt
File with $Id: id_with_colon.txt 1 2004-03-17 20:32:47Z davidb $ tag

[davidb@olcit test2]$ cat id_no_colon.txt
File with $Id: id_no_colon.txt 1 2004-03-17 20:32:47Z davidb $ tag

[davidb@olcit test2]$

*** END LOG ***

On Mar 17, 2004, at 8:20 AM, Ben Collins-Sussman wrote:

> On Tue, 2004-03-16 at 22:47, David Budworth wrote:
>> sysinfo: subversion 1.0.1, client rh9, server mdk10
>>
>> I'm stumped, I seem to be getting diffs on the $Id:$ tag for any file
>> I
>> add when use-commit-times and auto-props svn:keywords=Id is set in
>> /etc/subversion/config
>>
>> to test, i created a new repo "test2"
>>
>> I did (note: repo host is called svn):
>>
>> (first: get repo rev 0 and add a file)
>> svn co http://svn/test2
>> cd test2
>> echo 'a test file with $Id:$' > test.txt
>
> I'm confused: shouldn't that be just $Id$ for a new file? The colon
> is
> the 'expanded' form, i.e. "$Id: blah blah blah$". Might that be
> causing
> the spurious diff?
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 17 22:04:57 2004

This is an archived mail posted to the Subversion Users mailing list.