Problem merging with svn:keywords
From: Volker <sanam_dry_chili_at_yahoo.de>
Date: Sun, 16 Mar 2008 03:52:25 +0000 (GMT)
Dear List,
for a build I had to merge the following diff (Revision and Date are set with svn:keywords property)
- * @version 2.0.0 $Revision:$
- * @since $Date:$
+ * @version 2.0.1 $Revision$
+ * @since $Date$
and got a conflict. Has someone an idea why ? As I tested, the colon in the keyword expansion does not matter ...
Hammering the table,
Volker
Lesen Sie Ihre E-Mails jetzt einfach von unterwegs.
www.yahoo.de/go
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.