{"action":"created","issue":{"url":"https://api.github.com/repos/yyuu/pyenv/issues/360","labels_url":"https://api.github.com/repos/yyuu/pyenv/issues/360/labels{/name}","comments_url":"https://api.github.com/repos/yyuu/pyenv/issues/360/comments","events_url":"https://api.github.com/repos/yyuu/pyenv/issues/360/events","html_url":"https://github.com/yyuu/pyenv/pull/360","id":68697094,"number":360,"title":"Merge rbenv to have a common ancestor for future merges","user":{"login":"blueyed","id":9766,"avatar_url":"https://avatars.githubusercontent.com/u/9766?v=3","gravatar_id":"","url":"https://api.github.com/users/blueyed","html_url":"https://github.com/blueyed","followers_url":"https://api.github.com/users/blueyed/followers","following_url":"https://api.github.com/users/blueyed/following{/other_user}","gists_url":"https://api.github.com/users/blueyed/gists{/gist_id}","starred_url":"https://api.github.com/users/blueyed/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/blueyed/subscriptions","organizations_url":"https://api.github.com/users/blueyed/orgs","repos_url":"https://api.github.com/users/blueyed/repos","events_url":"https://api.github.com/users/blueyed/events{/privacy}","received_events_url":"https://api.github.com/users/blueyed/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-04-15T14:28:23Z","updated_at":"2015-04-15T14:35:38Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/yyuu/pyenv/pulls/360","html_url":"https://github.com/yyuu/pyenv/pull/360","diff_url":"https://github.com/yyuu/pyenv/pull/360.diff","patch_url":"https://github.com/yyuu/pyenv/pull/360.patch"},"body":"This merges\r\nhttps://github.com/sstephenson/rbenv/commits/4d72eefffc548081f6eee2e54d3b9116b9f9ee8e\r\nto build a common ancestor for future merges.\r\n\r\nThis is branched off f48a5b11d709ec616f766864b8e0ab894cb30962, which was\r\nthe last manual merge.\r\n\r\nDiscussion / initial idea: https://github.com/yyuu/pyenv/pull/286#issuecomment-66565475\r\n\r\nThis was done using:\r\n\r\n    # Keep our changes for \"unmerged, both added\"\r\n    for i in $(git status --porcelain | grep '^AA ' | cut -d\\  -f2); do\r\n      git checkout --ours $i\r\n      git add $i\r\n    done\r\n\r\n    # \"git mv\" rbenv files to our name, keeping the current contents.\r\n    for i in $(git status --porcelain | grep '^A ' | sed 's/^A  //'); do\r\n      ours=${i//rbenv/pyenv}\r\n      test -f $ours || { echo \"Skipping: $i\"; continue; }\r\n      git mv -f $i $ours\r\n      git reset HEAD $ours\r\n    done\r\n\r\nI've handled the following then manually:\r\n\r\n    - rbenv.d/exec/gem-rehash.bash\r\n    - rbenv.d/exec/gem-rehash/rubygems_plugin.rb\r\n\r\nThis should allow to merge rbenv in the future using:\r\n\r\n    git merge rbenv/master -s recursive -X rename-threshold=5%\r\n\r\nI am not sure about the rename-threshold, 25% also worked for one file\r\nI've tested.\r\n\r\nConflicts:\r\n    .gitignore\r\n    .travis.yml\r\n    LICENSE\r\n    README.md\r\n    src/Makefile.in\r\n    test/--version.bats\r\n    test/commands.bats\r\n    test/completions.bats\r\n    test/exec.bats\r\n    test/global.bats\r\n    test/help.bats\r\n    test/hooks.bats\r\n    test/init.bats\r\n    test/local.bats\r\n    test/prefix.bats\r\n    test/rehash.bats\r\n    test/run\r\n    test/shell.bats\r\n    test/shims.bats\r\n    test/test_helper.bash\r\n    test/version-file-read.bats\r\n    test/version-file-write.bats\r\n    test/version-file.bats\r\n    test/version-name.bats\r\n    test/version-origin.bats\r\n    test/version.bats\r\n    test/versions.bats\r\n    test/whence.bats\r\n    test/which.bats\r\n"},"comment":{"url":"https://api.github.com/repos/yyuu/pyenv/issues/comments/93425126","html_url":"https://github.com/yyuu/pyenv/pull/360#issuecomment-93425126","issue_url":"https://api.github.com/repos/yyuu/pyenv/issues/360","id":93425126,"user":{"login":"yyuu","id":63651,"avatar_url":"https://avatars.githubusercontent.com/u/63651?v=3","gravatar_id":"","url":"https://api.github.com/users/yyuu","html_url":"https://github.com/yyuu","followers_url":"https://api.github.com/users/yyuu/followers","following_url":"https://api.github.com/users/yyuu/following{/other_user}","gists_url":"https://api.github.com/users/yyuu/gists{/gist_id}","starred_url":"https://api.github.com/users/yyuu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yyuu/subscriptions","organizations_url":"https://api.github.com/users/yyuu/orgs","repos_url":"https://api.github.com/users/yyuu/repos","events_url":"https://api.github.com/users/yyuu/events{/privacy}","received_events_url":"https://api.github.com/users/yyuu/received_events","type":"User","site_admin":false},"created_at":"2015-04-15T14:35:38Z","updated_at":"2015-04-15T14:35:38Z","body":":dizzy_face: \r\n\r\nAnyway I'll try to check this out. Gimme some more time...."}}