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

handle transitions with read-only unmerged git-annex branches

Browse source 
Capstone to this feature. Any transitions that have been performed on an
unmerged remote ref but not on the local git-annex branch, or vice-versa
have to be applied on the fly when reading files.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2021-12-28 13:23:32 -04:00
parent 1291a7d86c
commit b1d719f9d2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 95 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_6_7fac2098e6d7cce997a540592e20c97a._comment
View file

@ -3,9 +3,11 @@
subject="""comment 6"""
date="2021-12-27T17:38:49Z"
content="""
Update: Completed and merged!
Current list of items that need to be fixed before this is mergeable:
- When there is a transition in one of the remote git-annex branches
- (fixed) When there is a transition in one of the remote git-annex branches
that has not yet been applied to the local or other git-annex branches.
Transitions are not handled.
- (fixed) `git-annex log` runs git log on the git-annex branch, and so