diff options
| author |  http://jamesjustjames.wordpress.com/ <purpleidea@web> | 2014-07-09 18:50:36 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-07-09 18:50:36 +0000 |
| commit | 26e6b241a610a41c691274c54c2e2cfbc7bc54ad (patch) | |
| tree | 2f7f1b0f6e65ff49dc1313484eca55b5e068c977 | |
| parent | e52cee12b9e24033a0aefebd91f39deb6babab47 (diff) | |
Added a comment: The guy with this bug.
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c946d2793fe0354151c447ddd0e59fd7._comment | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c946d2793fe0354151c447ddd0e59fd7._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c946d2793fe0354151c447ddd0e59fd7._comment new file mode 100644 index 000000000..20006ff6c --- /dev/null +++ b/doc/bugs/bad_merge_commit_deleting_all_files/comment_6_c946d2793fe0354151c447ddd0e59fd7._comment @@ -0,0 +1,41 @@ +[[!comment format=mdwn + username="http://jamesjustjames.wordpress.com/" + nickname="purpleidea" + subject="The guy with this bug." + date="2014-07-09T18:50:36Z" + 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... +"""]] |