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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2018-09-12 14:20:10 -04:00
commit a0dc0afdcb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/forum/repos_syncs_but_fails_to_show_files_in_one_direction.mdwn Normal file
View file

@ -0,0 +1,7 @@
I have a repo on two hosts. One host is my laptop which is configured as "manual" repo due to limited disk space and the other host is my NAS as "full backup" repo. My laptop connects via SSH to the NAS.
Strange thing is, syncing looks good. New files created on either side lead to a transfer. However, it doesn't show changes on the NAS that have been triggered on the notebook. For example, folders are missing and I can't see changes in files on the NAS which have been modified and synced from the laptop.
I suspect a problem being stuck with some old branch. Unfortunately, I have little to know knowledge to git commands. :-(
Any idea on how to troubleshoot the issue?

10
doc/git-annex-sync/comment_1_2e12ed1c1a594dfbd06a3f25f5e25e57._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="when push fails due to non-fast-forward merge, pull and retry?"
date="2018-09-12T17:56:40Z"
content="""
When a push would result in a non-fast-forward merge, git-annex-sync currently fails. Maybe instead, pull and retry pushing? This happens in the context of several processes trying to push to the same git-annex repo.
Also, the docs mention synced/master, but it's synced/current-branch.
"""]]