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

$Header$ confuses TortoiseMerge

From: NODA, Kai <nodakai_at_gmail.com>
Date: Wed, 08 Sep 2010 11:32:39 +0900

Hi, all

When the keyword substitution of $Header$ is enabled,
"Apply patch" functionality is confused and always results in
"The patch seems outdated" error, provided that
the context of a hunk includes $Header$.

How to reproduce:
 1. Prepare empty repo at C:\tsvnTest\repo
 2. Checkout it to C:\tsvnTest\wdir
 3. Create C:\tsvnTest\README.txt whose contents is as follows (three lines):
===BEGIN CONTENTS OF README.txt===
$Header:$

Thank you.
===END CONTENTS OF README.txt===
 4. Add it to the repo and set svn:keywords property to "Header"
 5. Commit the changeset.
 6. Edit the third line; substitute "Thank you" with "No thank you"
 7. "Create patch" yields something like

Index: README.txt
===================================================================
--- README.txt (revision 1)
+++ README.txt (working copy)
@@ -1,3 +1,3 @@
 $Header$

-Thank you.
+No thank you.

 8. Save the patch as C:\wdir\no.patch
 9. Revert README.txt
 10. Try to apply no.patch; but you'll encounter "The patch seems outdated" error.

Additional note:
Using $Id$ $Date$ $Rev$ or $URL$ doesn't cause this annoyance.

Version info:
> TortoiseSVN 1.6.10, Build 19898 - 64 Bit , 2010/07/16 15:46:08
> Subversion 1.6.12,
> apr 1.3.8
> apr-utils 1.3.9
> neon 0.29.3
> OpenSSL 0.9.8o 01 Jun 2010
> zlib 1.2.3

Thank you.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2656627

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-08 07:21:20 CEST

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