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

Re: svn diff and keywords

From: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-11-01 18:32:04 CET

On 11/1/05, Marcus Rueckert <darix@web.de> wrote:
> On 2005-11-01 11:08:43 -0600, Joshua Varner wrote:
> > http://subversion.tigris.org/issues/show_bug.cgi?id=2164
>
> i dont think thats 100% the same. the expanded version of the tag is in
> the tarball (svn export). the repos had the already changes for the file
> after the conversion from CVS.
>
Different symptom - same problem. The following recipe shows the
same kind of behavior you are talking about. It all comes from the fact
that we output the normalized line from the diff rather than the original.

Josh

In the www dir of subversion repos

$ sed -e "s/\$Date/hi \$Date/;" < subversion-linus.html >subversion-linus2.html

# I had to use -b b/c of cygwin line ending stuff
$ diff -b subversion-linus.html subversion-linus2.html
83c83
< <p>$Date: 2005-04-22 04:45:33 -0500 (Fri, 22 Apr 2005) $</p>

---
> <p>hi $Date: 2005-04-22 04:45:33 -0500 (Fri, 22 Apr 2005) $</p>
$ mv subversion-linus2.html subversion-linus.html
$ svn diff subversion-linus.html
Index: subversion-linus.html
===================================================================
--- subversion-linus.html       (revision 16345)
+++ subversion-linus.html       (working copy)
@@ -80,7 +80,7 @@
 <p><b>-The Subversion Development Team</b></p>
-<p>$Date$</p>
+<p>hi $Date$</p>
 </div>
 </body>
 </html>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 1 18:34:27 2005

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