{"action":"created","issue":{"url":"https://api.github.com/repos/DRMacIver/hypothesis/issues/82","labels_url":"https://api.github.com/repos/DRMacIver/hypothesis/issues/82/labels{/name}","comments_url":"https://api.github.com/repos/DRMacIver/hypothesis/issues/82/comments","events_url":"https://api.github.com/repos/DRMacIver/hypothesis/issues/82/events","html_url":"https://github.com/DRMacIver/hypothesis/issues/82","id":90109901,"number":82,"title":"Create a merge tool for the .hypothesis directory","user":{"login":"ckaran","id":12038467,"avatar_url":"https://avatars.githubusercontent.com/u/12038467?v=3","gravatar_id":"","url":"https://api.github.com/users/ckaran","html_url":"https://github.com/ckaran","followers_url":"https://api.github.com/users/ckaran/followers","following_url":"https://api.github.com/users/ckaran/following{/other_user}","gists_url":"https://api.github.com/users/ckaran/gists{/gist_id}","starred_url":"https://api.github.com/users/ckaran/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckaran/subscriptions","organizations_url":"https://api.github.com/users/ckaran/orgs","repos_url":"https://api.github.com/users/ckaran/repos","events_url":"https://api.github.com/users/ckaran/events{/privacy}","received_events_url":"https://api.github.com/users/ckaran/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-06-22T14:13:50Z","updated_at":"2015-06-22T14:42:47Z","closed_at":null,"body":"I've been using hypothesis for a while now, and have become so dependent on it that I use it on every machine I've got access to.  This is both good and bad; I now have .hypothesis directories on several machines, each of which have different sets of failing examples.  That means that to be sure I've killed a bug, I need to run the same code on multiple different machines, simply because I don't have an easy way of merging the various directories, with their associated examples, into one master directory.  Can you create a tool that can merge multiple .hypothesis directories into one?\r\n\r\nIdeally, this would be a tool that is git-compatible.  That is, something where the following works:\r\n\r\n> git config --global merge.tool customMergeTool\r\n> git config --global mergetool.customMergeTool.cmd 'customMergeTool.sh \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$MERGED\\\"'\r\n\r\nSee http://stackoverflow.com/questions/23313620/select-git-mergetool-based-on-file-type for more information about this.\r\n\r\nThe reason I want it to also be git compatible is because I want to commit the .hypothesis directory to my repository; there are cases where something fails, but only VERY rarely.  If we lose that one case, then it will be hard if not impossible to recreate it.  By having the ability to store the directory in the repository, not only do we protect against the loss of a machine with a valuable example, I and my coworkers immediately get access to the failing example, and can independently test our code.  Finally, our build/test farm also gets it, and can do repeated nightly tests, blindly committing the .hypothesis directory, which we can then all pull from the next day to see if there are any new failing examples.\r\n\r\n**References:**\r\nhttp://stackoverflow.com/questions/23313620/select-git-mergetool-based-on-file-type\r\nhttp://git-scm.com/docs/git-mergetool\r\nhttp://git-scm.com/docs/git-config search for `mergetool.<tool>.path` and `mergetool.<tool>.cmd`"},"comment":{"url":"https://api.github.com/repos/DRMacIver/hypothesis/issues/comments/114136993","html_url":"https://github.com/DRMacIver/hypothesis/issues/82#issuecomment-114136993","issue_url":"https://api.github.com/repos/DRMacIver/hypothesis/issues/82","id":114136993,"user":{"login":"ckaran","id":12038467,"avatar_url":"https://avatars.githubusercontent.com/u/12038467?v=3","gravatar_id":"","url":"https://api.github.com/users/ckaran","html_url":"https://github.com/ckaran","followers_url":"https://api.github.com/users/ckaran/followers","following_url":"https://api.github.com/users/ckaran/following{/other_user}","gists_url":"https://api.github.com/users/ckaran/gists{/gist_id}","starred_url":"https://api.github.com/users/ckaran/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckaran/subscriptions","organizations_url":"https://api.github.com/users/ckaran/orgs","repos_url":"https://api.github.com/users/ckaran/repos","events_url":"https://api.github.com/users/ckaran/events{/privacy}","received_events_url":"https://api.github.com/users/ckaran/received_events","type":"User","site_admin":false},"created_at":"2015-06-22T14:42:47Z","updated_at":"2015-06-22T14:42:47Z","body":"Man, you're **GOOD!**  OK, this issue should be closed then, I'll wait until the next release and start using it.  Thanks!"}}