summaryrefslogtreecommitdiff
path: root/Annex/Branch.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-08-28 16:38:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-08-28 16:41:13 -0400
commit69bfbd94004d193050e0fe0827f380bdd1ed5644 (patch)
treec0eac16499b9cbc8920c140bd2e1a9bdfd09839b /Annex/Branch.hs
parent0ffe5408ae1b396453f080bef2858542317daf23 (diff)
add forget command
Works, more or less. --dead is not implemented, and so far a new branch is made, but keys no longer present anywhere are not scrubbed. git annex sync fails to push the synced/git-annex branch after a forget, because it's not a fast-forward of the existing synced branch. Could be fixed by making git-annex sync use assistant-style sync branches.
Diffstat (limited to 'Annex/Branch.hs')
-rw-r--r--Annex/Branch.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index fa4b0265d..5af6b6be9 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -402,6 +402,7 @@ handleTransitions :: Transitions -> [Git.Ref] -> Annex (Maybe (Git.Branch, [Git.
handleTransitions localts refs = do
m <- M.fromList <$> mapM getreftransition refs
let remotets = M.elems m
+ liftIO $ print ("transitions", localts, remotets)
if all (localts ==) remotets
then return Nothing
else do