dgit.raspbian.org Git - git-annex.git/commit

]> dgit.raspbian.org Git - git-annex.git/commit

author	Joey Hess <joeyh@joeyh.name>
	Tue, 28 Dec 2021 17:23:32 +0000 (13:23 -0400)
committer	Joey Hess <joeyh@joeyh.name>
	Tue, 28 Dec 2021 17:23:32 +0000 (13:23 -0400)
commit	b1d719f9d29e38f422bc72e47499fe300bad54a3
tree	5c0faab5b0a9fc0fd7dddb690a5d064715469fba	tree \| snapshot
parent	1291a7d86cb4e9f673e50de8bdb203b029286ed2	commit \| diff

handle transitions with read-only unmerged git-annex branches

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

Annex/Branch.hs		diff \| blob \| history
Annex/Branch/Transitions.hs		diff \| blob \| history
Annex/BranchState.hs		diff \| blob \| history
Command/FilterBranch.hs		diff \| blob \| history
Logs/Transitions.hs		diff \| blob \| history
Types/BranchState.hs		diff \| blob \| history
Types/Transitions.hs	[new file with mode: 0644]	blob
doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_6_7fac2098e6d7cce997a540592e20c97a._comment		diff \| blob \| history
git-annex.cabal		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom