aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Freeman <rich@thefreemanclan.net>2014-09-28 19:57:01 -0400
committerRichard Freeman <rich@thefreemanclan.net>2014-09-28 19:57:01 -0400
commit016e362a256a5712089664714da50c3eeaba1048 (patch)
tree37eb8d8067031274dd5c948d0863ca7a9c66a1ed
parentDrop the cvs2svn libs; no longer needed/used (diff)
downloadgit-conversion-tools-016e362a256a5712089664714da50c3eeaba1048.tar.gz
git-conversion-tools-016e362a256a5712089664714da50c3eeaba1048.tar.bz2
git-conversion-tools-016e362a256a5712089664714da50c3eeaba1048.zip
Fix cvs keywords part 1.
-rw-r--r--config7
1 files changed, 5 insertions, 2 deletions
diff --git a/config b/config
index 395e526..2b2f44e 100644
--- a/config
+++ b/config
@@ -376,6 +376,9 @@ global_symbol_strategy_rules = [
# translated into a git-style name by the author_transforms map.
ctx.username = 'cvs2svn'
+def dont_expand_keywords(cvs_file):
+ return ( cvs_file.mode == 'b' or cvs_file.mode == 'o' )
+
# ctx.file_property_setters and ctx.revision_property_setters contain
# rules used to set the svn properties on files in the converted
# archive. For each file, the rules are tried one by one. Any rule
@@ -451,9 +454,9 @@ ctx.file_property_setters.extend([
# The following causes keywords to be untouched in binary files and
# collapsed in all text to be committed:
ConditionalPropertySetter(
- cvs_file_is_binary, KeywordHandlingPropertySetter('untouched'),
+ dont_expand_keywords , KeywordHandlingPropertySetter('untouched'),
),
- KeywordHandlingPropertySetter('collapsed'),
+ KeywordHandlingPropertySetter('expanded'),
])
ctx.revision_property_setters.extend([