From 10d77d95f454a2fb2806c031a14344dd7cdea006 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 Dec 2012 15:04:44 -0400
Subject: direct mode merging works!

Automatic merge resoltion code needs to be fixed to preserve objects from
direct mode files.
---
 Command/Sync.hs | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'Command/Sync.hs')

diff --git a/Command/Sync.hs b/Command/Sync.hs
index 7a034bfa4..2d1b2fb9c 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -15,7 +15,6 @@ import qualified Annex
 import qualified Annex.Branch
 import qualified Annex.Queue
 import Annex.Content
-import Annex.Content.Direct
 import Annex.Direct
 import Annex.CatFile
 import qualified Git.Command
@@ -179,31 +178,30 @@ mergeAnnex = do
 	void $ Annex.Branch.forceUpdate
 	stop
 
-{- Merges from a branch into the current branch.
- -
- - In direct mode, updates associated files mappings for the files that
- - were changed by the merge. -}
+{- Merges from a branch into the current branch. -}
 mergeFrom :: Git.Ref -> Annex Bool
-mergeFrom branch = ifM isDirect
-	( maybe go godirect =<< inRepo Git.Branch.current
-	, go
-	)
+mergeFrom branch = do
+	showOutput
+	ifM isDirect
+		( maybe go godirect =<< inRepo Git.Branch.current
+		, go
+		)
   where
-	go = do
-		showOutput
-		ok <- inRepo $ Git.Merge.mergeNonInteractive branch
-		if ok
-			then return ok
-			else resolveMerge
+	go = runmerge $ inRepo $ Git.Merge.mergeNonInteractive branch
 	godirect currbranch = do
 		old <- inRepo $ Git.Ref.sha currbranch
-		r <- go
+		d <- fromRepo gitAnnexMergeDir
+		r <- runmerge $ inRepo $ mergeDirect d branch
 		new <- inRepo $ Git.Ref.sha currbranch
 		case (old, new) of
-			(Just oldsha, Just newsha) -> do
-				updateAssociatedFiles oldsha newsha
+			(Just oldsha, Just newsha) ->
+				mergeDirectCleanup d oldsha newsha
 			_ -> noop
 		return r
+	runmerge a = ifM (a)
+		( return True
+		, resolveMerge
+		)
 
 {- Resolves a conflicted merge. It's important that any conflicts be
  - resolved in a way that itself avoids later merge conflicts, since
-- 
cgit v1.2.3