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

git-annex merge branch

Browse source 
* merge: When run with a branch parameter, merges from that branch.
  This is especially useful when using an adjusted branch, because
  it applies the same adjustment to the branch before merging it.
This commit is contained in:
Joey Hess 2019-08-09 13:21:15 -04:00
parent b90ee6dc52
commit b87ea12b6b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Test.hs
View file

@ -1848,9 +1848,7 @@ test_export_import_subdir = intmpclonerepoInDirect $ do
testimport = do
git_annex "import" ["master:"++subdir, "--from", "foo"] @? "import of subdir failed"
up <- Git.Merge.mergeUnrelatedHistoriesParam
let mergeps = [Param "merge", Param "foo/master", Param "-mmerge"] ++ maybeToList up
boolSystem "git" mergeps @? "git merge foo/master failed"
git_annex "merge" ["foo/master"] @? "git annex merge foo/master failed"
-- Make sure that import did not import the file to the top
-- of the repo.