work around adjusted unlocked branch problem in test suite
This commit is contained in:
parent
aac0e187c5
commit
9e230cd448
2 changed files with 34 additions and 0 deletions
10
Test.hs
10
Test.hs
|
@ -1738,6 +1738,11 @@ test_export_import = intmpclonerepoInDirect $ do
|
|||
git_annex "get" [] @? "get of files failed"
|
||||
annexed_present annexedfile
|
||||
|
||||
-- When on an adjusted branch, this updates the master branch
|
||||
-- to match it, which is necessary since the master branch is going
|
||||
-- to be exported.
|
||||
git_annex "sync" [] @? "sync failed"
|
||||
|
||||
git_annex "export" ["master", "--to", "foo"] @? "export to dir failed"
|
||||
dircontains annexedfile (content annexedfile)
|
||||
|
||||
|
@ -1793,6 +1798,11 @@ test_export_import_subdir = intmpclonerepoInDirect $ do
|
|||
@? "git mv failed"
|
||||
boolSystem "git" [Param "commit", Param "-m", Param "moved"]
|
||||
@? "git commit failed"
|
||||
|
||||
-- When on an adjusted branch, this updates the master branch
|
||||
-- to match it, which is necessary since the master branch is going
|
||||
-- to be exported.
|
||||
git_annex "sync" [] @? "sync failed"
|
||||
|
||||
-- Run three times because there was a bug that took a couple
|
||||
-- of runs to lead to the wrong tree being written to the remote
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue