mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use "variant" rather than "version"

Browse source 
While this word may be less familiar to some users, it avoids the
connotation that version 2 is better than version 1, which is wrong
when the two variants were conflicting.
This commit is contained in:
Joey Hess 2012-06-27 16:09:17 -04:00
parent 054ddda18a
commit 36ddb81df6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/Sync.hs
View file

@ -251,11 +251,11 @@ mergeFile file key
| doubleconflict = go $ show key | doubleconflict = go $ show key
| otherwise = go $ shortHash $ show key | otherwise = go $ shortHash $ show key
where where
vermarker = ".version-" varmarker = ".variant-"
doubleconflict = vermarker `isSuffixOf` (dropExtension file) doubleconflict = vermarker `isSuffixOf` (dropExtension file)
go v = takeDirectory file go v = takeDirectory file
</> dropExtension (takeFileName file) </> dropExtension (takeFileName file)
++ vermarker ++ v ++ varmarker ++ v
++ takeExtension file ++ takeExtension file
shortHash :: String -> String shortHash :: String -> String