summaryrefslogtreecommitdiff
path: root/doc/bugs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-11 12:15:29 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-11 12:15:29 -0400
commitc4257a86ab67f1e08d6ff55bbc91e89858ba3fe7 (patch)
treead758beb20a85482cb643fea1818e542e192a0d9 /doc/bugs
parent307b40f19591b53830d7d7614bc4be8ff41f1327 (diff)
parentadf045ca55c4f63cd3da12e84690a302fbda7834 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/bugs')
-rw-r--r--doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment50
1 files changed, 50 insertions, 0 deletions
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment
new file mode 100644
index 000000000..e6d6ace9d
--- /dev/null
+++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment
@@ -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?
+"""]]