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

comment

Browse source
This commit is contained in:
Joey Hess 2020-07-02 14:43:52 -04:00
parent f8ed8a916c
commit d8ad2204c7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
doc/bugs/import_tree_on_adjusted_unlocked_branch_issues/comment_2_7fc16d6ff0f1a61907bc34e8f8b71adc._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2020-07-02T18:36:55Z"
content="""
Only workaround would be to `git checkout master` before running the
import, and then re-run `git annex adjust` to re-enter the adjusted branch.
But that may be problimatic depending on why you're using adjusted
branches, or just expensive.
git-annex merge is *supposed* to deal with this problem, it's supposed
to adjust the branch before merging it. git-annex sync does too.
But the test suite is actually using git-annex merge, so it seems
the bug is in git-annex merge/sync.
"""]]