{"action":"closed","issue":{"url":"https://api.github.com/repos/OCA/maintainer-tools/issues/247","repository_url":"https://api.github.com/repos/OCA/maintainer-tools","labels_url":"https://api.github.com/repos/OCA/maintainer-tools/issues/247/labels{/name}","comments_url":"https://api.github.com/repos/OCA/maintainer-tools/issues/247/comments","events_url":"https://api.github.com/repos/OCA/maintainer-tools/issues/247/events","html_url":"https://github.com/OCA/maintainer-tools/issues/247","id":194462693,"number":247,"title":"Migration With Diverged Parents ","user":{"login":"lasley","id":7397578,"avatar_url":"https://avatars.githubusercontent.com/u/7397578?v=3","gravatar_id":"","url":"https://api.github.com/users/lasley","html_url":"https://github.com/lasley","followers_url":"https://api.github.com/users/lasley/followers","following_url":"https://api.github.com/users/lasley/following{/other_user}","gists_url":"https://api.github.com/users/lasley/gists{/gist_id}","starred_url":"https://api.github.com/users/lasley/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lasley/subscriptions","organizations_url":"https://api.github.com/users/lasley/orgs","repos_url":"https://api.github.com/users/lasley/repos","events_url":"https://api.github.com/users/lasley/events{/privacy}","received_events_url":"https://api.github.com/users/lasley/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2016-12-08T22:32:57Z","updated_at":"2016-12-08T22:51:58Z","closed_at":"2016-12-08T22:51:58Z","body":"Our new migration instructions in the Wiki are awesome, but we seem to have an edge case when the parents diverged. If a module is created in another branch, the format-patch is not bringing those commits in. \r\n\r\nFollowing is an example using `stock-logistics-barcode`:\r\n\r\n```\r\n$ git rev-parse --verify HEAD\r\n4b8516e2bdfb2c9a95dc18f0e2da5e469811ecd3\r\n$ git format-patch --stdout OCA/10.0..OCA/9.0 -- barcodes_generator_abstract | git am -3\r\n$ git diff\r\n$ git rev-parse --verify HEAD\r\n4b8516e2bdfb2c9a95dc18f0e2da5e469811ecd3\r\n```\r\n\r\nUnfortunately my git-fu is not able to accomplish this feat without an intermediate merge commit, so I am creating this issue instead of fixing the wiki. \r\n\r\nEdit: I didn't paste the checkout, but it was from `OCA/10.0` & remotes updated"}}
{"actor":{"display_login":"lasley"}}