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

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

Browse source
This commit is contained in:
Joey Hess 2015-12-11 12:15:29 -04:00
commit 4407df6314
Failed to extract signature
3 changed files with 67 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment Normal file
View file

@ -0,0 +1,50 @@
[[!comment format=mdwn
username="yminus"
subject="comment 7"
date="2015-12-10T22:25:26Z"
content="""
I have the same problem as the initial reporter.
USB drive is FAT32 in direct mode
laptop is ext4 in indirect mode
nas is ext4 in indirect mode
Syncing nas with laptop and vice versa works with no problems.
But as soon as I sync with USB drive it behaves like all commits on laptop and nas that happened since the last sync are reverted.
I can recover the files on laptop and nas by ```git reset --hard origin/master``` and ```git reset --hard origin/synced/master``` on laptop or nas.
However, I cannot reset master and synced/master on the USB drive (error is \"fatal: This operation must be run in a work tree\").
This is the tree as seen from the on laptop after syncing and resetting as described above:
* 9bdc037 (n900/synced/master, n900/master) merge refs/heads/synced/master ### <--- THIS IS THE STATE WHEN SYNCING WITH USB DRIVE all added files are deleted
|\
| * 1236008 (HEAD -> master, origin/synced/master, origin/master, nas/synced/master, nas/master, synced/master) ADDED FILES ### <--- THIS IS THE LAST GOOD STATE
| * 17c4f54 ADDED FILES
| * 364d525 Merge remote-tracking branch 'refs/remotes/origin/master'
| |\
| | * c18f170 ADDED FILES
| | * 9dd5668 ADDED FILES
| * | c3280fc ADDED FILES
| * | 2babe80 ADDED FILES
| * | b964e29 ADDED FILES
| * | 03f3bd1 ADDED FILES
| * | 010a469 ADDED FILES
| * | 8acf199 ADDED FILES
| * | f2477bc Merge remote-tracking branch 'refs/remotes/origin/master'
| |\ \
| | |/
| | * 121ffd1 ADDED FILES
* | | dc88b8a (n900/annex/direct/master) git-annex in lars@lars-laptop:/run/media/lars/Nokia N900/.sounds/Musik ### <--- THIS IS THE CURRENT STATE ON THE USB DRIVE
|/ /
*
n900 is the USB drive
nas and origin are both the same
How can I sync my USB drive without loosing my last commits?
"""]]

8
doc/walkthrough/removing_files/comment_3_91e995867a731325dfdf3331f69a238c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="fbicknel@01ede624a1a56b3998b823e9b60da0ff81cccb16"
nickname="fbicknel"
subject="Complete removal"
date="2015-12-10T16:16:43Z"
content="""
So, and I hope this isn't too Captain Obvious, if we drop the file at each repo, we essentially remove it from existence as far as this git-annex cluster is concerned?
"""]]

9
doc/walkthrough/removing_files/comment_4_9b575f7f2b67b36599890dd5455dcf47._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://joeyh.name/"
subject="comment 4"
date="2015-12-10T18:58:46Z"
content="""
Correct, dropping a file from everywhere will lose its content entirely.
But, git-annex has a [[copies]] tracking feature that prevents such foot-shooting. If you ask it to drop the last copy, it will refuse, although there is a way to override this if you really want to.
"""]]