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

rename

Browse source
This commit is contained in:
Joey Hess 2015-12-29 17:02:14 -04:00
parent 996ae9b172
commit 10ecc43790
Failed to extract signature
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/AutoMerge.hs
View file

@ -167,10 +167,10 @@ resolveMerge' unstagedmap (Just us) them u = do
makesymlink key dest = do makesymlink key dest = do
l <- calcRepo $ gitAnnexLink dest key l <- calcRepo $ gitAnnexLink dest key
replacewithlink dest l replacewithsymlink dest l
stageSymlink dest =<< hashSymlink l stageSymlink dest =<< hashSymlink l
replacewithlink dest link = ifM isDirect replacewithsymlink dest link = ifM isDirect
( do ( do
d <- fromRepo gitAnnexMergeDir d <- fromRepo gitAnnexMergeDir
replaceFile (d </> dest) $ makeGitLink link replaceFile (d </> dest) $ makeGitLink link
@ -211,7 +211,7 @@ resolveMerge' unstagedmap (Just us) them u = do
Nothing -> noop Nothing -> noop
Just sha -> do Just sha -> do
link <- catSymLinkTarget sha link <- catSymLinkTarget sha
replacewithlink item link replacewithsymlink item link
resolveby ks a = do resolveby ks a = do
{- Remove conflicted file from index so merge can be resolved. -} {- Remove conflicted file from index so merge can be resolved. -}