summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2014-07-09 19:26:55 +0000
committerGravatar admin <admin@branchable.com>2014-07-09 19:26:55 +0000
commit3ea6a2d05e5f4b66c619c5e4b8636e1802796446 (patch)
treef4e6fa26c97c8d47f30dbc06ababd35d814ffb90
parent06acd390fbc2340c5878cbf3831e058f71080988 (diff)
Added a comment: more confirmation of race theory
-rw-r--r--doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment
new file mode 100644
index 000000000..0cb39e7c8
--- /dev/null
+++ b/doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.55"
+ subject="more confirmation of race theory"
+ date="2014-07-09T19:26:55Z"
+ content="""
+@purpleidea showed me his git log, and as I had expected, there were previous empty commits immediately before the 2 commits that removes all of his files (which happened independenctly on 2 different machines running the assistant). This is consistent with my suspicion it's a race. Note that the assistant's git ref watcher can easily run multiple merges concurrently if multiple refs change.
+"""]]