diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-07-21 17:37:22 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-07-21 17:37:22 +0000 |
| commit | 459dfa80bd20ec59e4097ecd73854c2b74b8672b (patch) | |
| tree | 02416a63565563b4e30a8f51ef59cbd88cc5db05 /doc | |
| parent | 64366e41664b09d0439bd660d6ec3ddb1e55964c (diff) | |
Added a comment
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/git_annex_still_deleting_content_when_merging/comment_1_cb51e25c5e1656dcbb73b3ff680341f0._comment | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/bugs/git_annex_still_deleting_content_when_merging/comment_1_cb51e25c5e1656dcbb73b3ff680341f0._comment b/doc/bugs/git_annex_still_deleting_content_when_merging/comment_1_cb51e25c5e1656dcbb73b3ff680341f0._comment new file mode 100644 index 000000000..76db9bcc5 --- /dev/null +++ b/doc/bugs/git_annex_still_deleting_content_when_merging/comment_1_cb51e25c5e1656dcbb73b3ff680341f0._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="108.236.230.124" + subject="comment 1" + date="2014-07-21T17:37:22Z" + content=""" +Well, this is definitely a different bug or issue than the \"ugly bug\". In particular, it only affects a single file. Also, based on the commits, this may not be occuring in a merge commit at all (although I am not sure; I am not familiar with the log syntax shown). + +AFAICS, the problem occurs on machine B. Which machine is the transcript from? + +The \"Removing shared.skg\" is a good clue. This seems to be printed by `git`, in merge-recursive.c's `process_entry`. What is puzzling to me is that it's printed after the \"Automatic merge went well; stopped before committing as requested\", which AFAICS is printed out by git last thing. Is this \"Removing\" message then printed out by another git command? + +Enabling debug logging would probably help a lot, to narrow that down the next time this occurs. +"""]] |