diff options
Diffstat (limited to 'doc/bugs/bad_merge_commit_deleting_all_files/comment_5_f58c946d294c802beb96df69412700e9._comment')
-rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files/comment_5_f58c946d294c802beb96df69412700e9._comment | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_5_f58c946d294c802beb96df69412700e9._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_5_f58c946d294c802beb96df69412700e9._comment deleted file mode 100644 index 597bbd438..000000000 --- a/doc/bugs/bad_merge_commit_deleting_all_files/comment_5_f58c946d294c802beb96df69412700e9._comment +++ /dev/null @@ -1,41 +0,0 @@ -[[!comment format=mdwn - username="http://jamesjustjames.wordpress.com/" - nickname="purpleidea" - subject="The guy with this bug." - date="2014-07-09T18:50:25Z" - content=""" -* Sure enough looking though the git log, I found one that removed 81 -files. It was useful to grep for 'deletions'. - -* It turned out there were actually two, one from each of the two -git-annex-assistant machines. I had to do the revert separately on each -machine for the corresponding commit that it had made. - -* I typically run the latest version that the webapp offers, within -about a week or so of it prompting me (unless I'm away for a while). -This means that maybe you can track down the approximate version where -this occured by looking at the two commit dates of the \"bad\" merges: - -commit bbe43fb638d101d5b9bfa65a4023e7f9d90e72e6 -Merge: 351cca8 95935ce -Author: James <james@computer1> -Date: Tue Jul 8 02:15:57 2014 -0400 - -commit 1902a3af25b1ce3723c38877c7f25907885040e4 -Merge: 125b984 efcece7 -Author: James <james@computer2> -Date: Tue Jul 8 02:15:27 2014 -0400 - -* I use the command line for pretty much most of what I do. Funny enough -though I only really use git-annex through the webapp. - -* Bug wise I don't know if this is relevant, but I have done the -following: -> added/changed/removed files to ~/annex on computer one while git-annex -wasn't running -> added/changed/removed files to ~/annex on computer two while it wasn't -running -> started git-annex on computer one -> started git-annex on computer two -> and similar combinations of the above... -"""]] |