sync in view branch updates the view branch
* sync: When run in a view branch, refresh the view branch to reflect any changes that have been made to the parent branch or metadata. This is basically working, but probably needs some more work to deal with all the edge cases of things sync does. Sponsored-by: Lawrence Brogan on Patreon
This commit is contained in:
parent
a11d6e0baf
commit
5f9bf51438
6 changed files with 115 additions and 14 deletions
|
@ -0,0 +1,29 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 4"""
|
||||
date="2023-02-08T19:32:34Z"
|
||||
content="""
|
||||
`git-annex sync` when in a view branch will now update it.
|
||||
|
||||
Leaving this open for optimising it.
|
||||
|
||||
Also because of this problem:
|
||||
|
||||
joey@darkstar:~/tmp/m#master(author=_)>git-annex sync
|
||||
commit
|
||||
On branch views/master(author=_)
|
||||
nothing to commit, working tree clean
|
||||
ok
|
||||
merge synced/master
|
||||
fatal: refusing to merge unrelated histories
|
||||
failed
|
||||
|
||||
Looks like it should not be trying to merge the synced/master
|
||||
branch into the view branch. But, this makes me wonder, does the master branch
|
||||
get updated with new files pulled from remotes? If not, the view branch
|
||||
won't be updated to have them either.
|
||||
|
||||
Also, I think that it may try to import trees from importree special remotes,
|
||||
into the view branch. Perhaps those should also get imported but merged into
|
||||
the master branch...
|
||||
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue