summaryrefslogtreecommitdiff
path: root/doc/bugs/files_lost_during_upgrade
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2014-07-10 19:10:15 +0000
committerGravatar admin <admin@branchable.com>2014-07-10 19:10:15 +0000
commit121252d88ddd11a56b17158171f74dbecb2adc82 (patch)
tree8d3748a5a9f28fc78e3e1701efe01abda4e86cf4 /doc/bugs/files_lost_during_upgrade
parentc296effb7527fe288f897d533edc0ae221d87ba2 (diff)
Added a comment
Diffstat (limited to 'doc/bugs/files_lost_during_upgrade')
-rw-r--r--doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment b/doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment
new file mode 100644
index 000000000..b09df4eeb
--- /dev/null
+++ b/doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.2"
+ subject="comment 2"
+ date="2014-07-10T19:10:15Z"
+ content="""
+Looking back at this bug, it's clearly the same race that I later
+debugged and fixed in [[bad_merge_commit_deleting_all_files]]. There are instructions in that bug for recovering it.
+
+In particular, the \"fatal: Could not switch to '/home/jwiklund/Documents/.git/annex/merge/': No such file or directory\" is because of the race; the merge directory is being created and deleted by two contending threads.
+"""]]