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

rename for clarity

Browse source
This commit is contained in:
Joey Hess 2014-03-03 16:33:21 -04:00
parent d6696dbc98
commit 6dc8bfad0b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Command/Sync.hs
View file

@ -373,7 +373,7 @@ resolveMerge = do
resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath)
resolveMerge' u
| issymlink LsFiles.valUs && issymlink LsFiles.valThem = do
| mergeable LsFiles.valUs && mergeable LsFiles.valThem = do
kus <- getKey LsFiles.valUs
kthem <- getKey LsFiles.valThem
case (kus, kthem) of
@ -408,7 +408,8 @@ resolveMerge' u
| otherwise = return Nothing
where
file = LsFiles.unmergedFile u
issymlink select = select (LsFiles.unmergedBlobType u) `elem` [Just SymlinkBlob, Nothing]
mergeable select = select (LsFiles.unmergedBlobType u)
`elem` [Just SymlinkBlob, Nothing]
makelink key = do
let dest = variantFile file key
l <- inRepo $ gitAnnexLink dest key