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

import command is updating tracking branch

Browse source
This commit is contained in:
Joey Hess 2019-02-26 13:11:25 -04:00
parent 5afe4135c2
commit e4e464da65
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 68 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/todo/import_tree.mdwn
View file

@ -10,6 +10,17 @@ this.
## implementation notes
* "git annex import master --from rmt" followed by "git annex import master:sub --from rmt"
first makes the tracking branch contain only what's in the remote,
and then grafts what's in the remote into a subdir. Is that the behavior
a user would expect, or would they instead expect that importing to a new
place starts the tracking branch over fresh on the contents of master?
Hmm, one way to look at it is that if there was a merge from
refs/remotes/rmt/master in between the two commands, and then after, the
result would be the same as if there was only a merge after. So the
current behavior seems to make sense.
* Database.ContentIdentifier needs a way to update the database with
information coming from the git-annex branch. This will allow multiple
clones to import from the same remote, and share content identifier