# HG changeset patch # User Christian Ebert # Date 1259345042 0 # Node ID 059f0563d1f8bed21f530bfa549b29c7d91a126c # Parent 583a0371249cec33023216d6aa61a984abecf6f8# Parent 25e813ce68e27033b53e000f855b419666e88da2 (stable) merge diff -r 583a0371249c -r 059f0563d1f8 hgkw/keyword.py --- a/hgkw/keyword.py Thu Nov 26 20:50:16 2009 +0100 +++ b/hgkw/keyword.py Fri Nov 27 18:04:02 2009 +0000 @@ -111,7 +111,8 @@ 'Revision': '{node|short}', 'Author': '{author|user}', 'Date': '{date|utcdate}', - 'RCSFile': '{file|basename},v', + 'RCSfile': '{file|basename},v', + 'RCSFile': '{file|basename},v', # kept only for backwards compatibility 'Source': '{root}/{file},v', 'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}', 'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}', diff -r 583a0371249c -r 059f0563d1f8 tests/test-keyword.out --- a/tests/test-keyword.out Thu Nov 26 20:50:16 2009 +0100 +++ b/tests/test-keyword.out Fri Nov 27 18:04:02 2009 +0000 @@ -9,6 +9,7 @@ Header = {root}/{file},v {node|short} {date|utcdate} {author|user} Id = {file|basename},v {node|short} {date|utcdate} {author|user} RCSFile = {file|basename},v +RCSfile = {file|basename},v Revision = {node|short} Source = {root}/{file},v $Author: test $ @@ -16,6 +17,7 @@ $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ $RCSFile: demo.txt,v $ +$RCSfile: demo.txt,v $ $Revision: xxxxxxxxxxxx $ $Source: /TMP/demo.txt,v $ [extensions]