{"action":"opened","number":37,"pull_request":{"url":"https://api.github.com/repos/vcstools/wstool/pulls/37","id":39828825,"html_url":"https://github.com/vcstools/wstool/pull/37","diff_url":"https://github.com/vcstools/wstool/pull/37.diff","patch_url":"https://github.com/vcstools/wstool/pull/37.patch","issue_url":"https://api.github.com/repos/vcstools/wstool/issues/37","number":37,"state":"open","locked":false,"title":"fix #36:  disregard that other file is .rosinstall file for wstool merge","user":{"login":"tkruse","id":1525116,"avatar_url":"https://avatars.githubusercontent.com/u/1525116?v=3","gravatar_id":"","url":"https://api.github.com/users/tkruse","html_url":"https://github.com/tkruse","followers_url":"https://api.github.com/users/tkruse/followers","following_url":"https://api.github.com/users/tkruse/following{/other_user}","gists_url":"https://api.github.com/users/tkruse/gists{/gist_id}","starred_url":"https://api.github.com/users/tkruse/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tkruse/subscriptions","organizations_url":"https://api.github.com/users/tkruse/orgs","repos_url":"https://api.github.com/users/tkruse/repos","events_url":"https://api.github.com/users/tkruse/events{/privacy}","received_events_url":"https://api.github.com/users/tkruse/received_events","type":"User","site_admin":false},"body":"Based on the patch, the following should work:\r\n```\r\nwstool merge ../../my_workspace/src/.rosinstall\r\n```\r\n\r\nbut not this:\r\n\r\n```\r\nwstool merge ../../my_workspace/src/\r\n```\r\n\r\nThe init command already behaves like this, so no change needed for the init command.\r\n\r\nThe patch changes some internal wstool API which is not used by rosws.\r\n\r\nThe patch itself is small, I did not write extra tests. I guess the review should mainly be concerned about the API change, double checking that I did not forget a client call that would break.","created_at":"2015-07-13T16:14:18Z","updated_at":"2015-07-13T16:14:18Z","closed_at":null,"merged_at":null,"merge_commit_sha":"91153ce6b74ec2bca3f3bdcc3169625e58bad494","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/vcstools/wstool/pulls/37/commits","review_comments_url":"https://api.github.com/repos/vcstools/wstool/pulls/37/comments","review_comment_url":"https://api.github.com/repos/vcstools/wstool/pulls/comments{/number}","comments_url":"https://api.github.com/repos/vcstools/wstool/issues/37/comments","statuses_url":"https://api.github.com/repos/vcstools/wstool/statuses/3b21c59942bd44732d0e4c3c98cb9850bc83497c","head":{"label":"tkruse:fix-merge","ref":"fix-merge","sha":"3b21c59942bd44732d0e4c3c98cb9850bc83497c","user":{"login":"tkruse","id":1525116,"avatar_url":"https://avatars.githubusercontent.com/u/1525116?v=3","gravatar_id":"","url":"https://api.github.com/users/tkruse","html_url":"https://github.com/tkruse","followers_url":"https://api.github.com/users/tkruse/followers","following_url":"https://api.github.com/users/tkruse/following{/other_user}","gists_url":"https://api.github.com/users/tkruse/gists{/gist_id}","starred_url":"https://api.github.com/users/tkruse/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tkruse/subscriptions","organizations_url":"https://api.github.com/users/tkruse/orgs","repos_url":"https://api.github.com/users/tkruse/repos","events_url":"https://api.github.com/users/tkruse/events{/privacy}","received_events_url":"https://api.github.com/users/tkruse/received_events","type":"User","site_admin":false},"repo":{"id":6839351,"name":"wstool","full_name":"tkruse/wstool","owner":{"login":"tkruse","id":1525116,"avatar_url":"https://avatars.githubusercontent.com/u/1525116?v=3","gravatar_id":"","url":"https://api.github.com/users/tkruse","html_url":"https://github.com/tkruse","followers_url":"https://api.github.com/users/tkruse/followers","following_url":"https://api.github.com/users/tkruse/following{/other_user}","gists_url":"https://api.github.com/users/tkruse/gists{/gist_id}","starred_url":"https://api.github.com/users/tkruse/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tkruse/subscriptions","organizations_url":"https://api.github.com/users/tkruse/orgs","repos_url":"https://api.github.com/users/tkruse/repos","events_url":"https://api.github.com/users/tkruse/events{/privacy}","received_events_url":"https://api.github.com/users/tkruse/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/tkruse/wstool","description":"A tool for managing a workspace of multiple heterogenous SCM repositories ","fork":true,"url":"https://api.github.com/repos/tkruse/wstool","forks_url":"https://api.github.com/repos/tkruse/wstool/forks","keys_url":"https://api.github.com/repos/tkruse/wstool/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tkruse/wstool/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tkruse/wstool/teams","hooks_url":"https://api.github.com/repos/tkruse/wstool/hooks","issue_events_url":"https://api.github.com/repos/tkruse/wstool/issues/events{/number}","events_url":"https://api.github.com/repos/tkruse/wstool/events","assignees_url":"https://api.github.com/repos/tkruse/wstool/assignees{/user}","branches_url":"https://api.github.com/repos/tkruse/wstool/branches{/branch}","tags_url":"https://api.github.com/repos/tkruse/wstool/tags","blobs_url":"https://api.github.com/repos/tkruse/wstool/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tkruse/wstool/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tkruse/wstool/git/refs{/sha}","trees_url":"https://api.github.com/repos/tkruse/wstool/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tkruse/wstool/statuses/{sha}","languages_url":"https://api.github.com/repos/tkruse/wstool/languages","stargazers_url":"https://api.github.com/repos/tkruse/wstool/stargazers","contributors_url":"https://api.github.com/repos/tkruse/wstool/contributors","subscribers_url":"https://api.github.com/repos/tkruse/wstool/subscribers","subscription_url":"https://api.github.com/repos/tkruse/wstool/subscription","commits_url":"https://api.github.com/repos/tkruse/wstool/commits{/sha}","git_commits_url":"https://api.github.com/repos/tkruse/wstool/git/commits{/sha}","comments_url":"https://api.github.com/repos/tkruse/wstool/comments{/number}","issue_comment_url":"https://api.github.com/repos/tkruse/wstool/issues/comments{/number}","contents_url":"https://api.github.com/repos/tkruse/wstool/contents/{+path}","compare_url":"https://api.github.com/repos/tkruse/wstool/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tkruse/wstool/merges","archive_url":"https://api.github.com/repos/tkruse/wstool/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tkruse/wstool/downloads","issues_url":"https://api.github.com/repos/tkruse/wstool/issues{/number}","pulls_url":"https://api.github.com/repos/tkruse/wstool/pulls{/number}","milestones_url":"https://api.github.com/repos/tkruse/wstool/milestones{/number}","notifications_url":"https://api.github.com/repos/tkruse/wstool/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tkruse/wstool/labels{/name}","releases_url":"https://api.github.com/repos/tkruse/wstool/releases{/id}","created_at":"2012-11-24T12:10:26Z","updated_at":"2014-10-02T15:46:34Z","pushed_at":"2015-07-13T16:03:50Z","git_url":"git://github.com/tkruse/wstool.git","ssh_url":"git@github.com:tkruse/wstool.git","clone_url":"https://github.com/tkruse/wstool.git","svn_url":"https://github.com/tkruse/wstool","homepage":null,"size":273,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"vcstools:master","ref":"master","sha":"928d01b227d4e8a204765eab14541a8ca852e125","user":{"login":"vcstools","id":2239949,"avatar_url":"https://avatars.githubusercontent.com/u/2239949?v=3","gravatar_id":"","url":"https://api.github.com/users/vcstools","html_url":"https://github.com/vcstools","followers_url":"https://api.github.com/users/vcstools/followers","following_url":"https://api.github.com/users/vcstools/following{/other_user}","gists_url":"https://api.github.com/users/vcstools/gists{/gist_id}","starred_url":"https://api.github.com/users/vcstools/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vcstools/subscriptions","organizations_url":"https://api.github.com/users/vcstools/orgs","repos_url":"https://api.github.com/users/vcstools/repos","events_url":"https://api.github.com/users/vcstools/events{/privacy}","received_events_url":"https://api.github.com/users/vcstools/received_events","type":"Organization","site_admin":false},"repo":{"id":6774852,"name":"wstool","full_name":"vcstools/wstool","owner":{"login":"vcstools","id":2239949,"avatar_url":"https://avatars.githubusercontent.com/u/2239949?v=3","gravatar_id":"","url":"https://api.github.com/users/vcstools","html_url":"https://github.com/vcstools","followers_url":"https://api.github.com/users/vcstools/followers","following_url":"https://api.github.com/users/vcstools/following{/other_user}","gists_url":"https://api.github.com/users/vcstools/gists{/gist_id}","starred_url":"https://api.github.com/users/vcstools/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vcstools/subscriptions","organizations_url":"https://api.github.com/users/vcstools/orgs","repos_url":"https://api.github.com/users/vcstools/repos","events_url":"https://api.github.com/users/vcstools/events{/privacy}","received_events_url":"https://api.github.com/users/vcstools/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/vcstools/wstool","description":"A tool for managing a workspace of multiple heterogenous SCM repositories ","fork":false,"url":"https://api.github.com/repos/vcstools/wstool","forks_url":"https://api.github.com/repos/vcstools/wstool/forks","keys_url":"https://api.github.com/repos/vcstools/wstool/keys{/key_id}","collaborators_url":"https://api.github.com/repos/vcstools/wstool/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/vcstools/wstool/teams","hooks_url":"https://api.github.com/repos/vcstools/wstool/hooks","issue_events_url":"https://api.github.com/repos/vcstools/wstool/issues/events{/number}","events_url":"https://api.github.com/repos/vcstools/wstool/events","assignees_url":"https://api.github.com/repos/vcstools/wstool/assignees{/user}","branches_url":"https://api.github.com/repos/vcstools/wstool/branches{/branch}","tags_url":"https://api.github.com/repos/vcstools/wstool/tags","blobs_url":"https://api.github.com/repos/vcstools/wstool/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/vcstools/wstool/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/vcstools/wstool/git/refs{/sha}","trees_url":"https://api.github.com/repos/vcstools/wstool/git/trees{/sha}","statuses_url":"https://api.github.com/repos/vcstools/wstool/statuses/{sha}","languages_url":"https://api.github.com/repos/vcstools/wstool/languages","stargazers_url":"https://api.github.com/repos/vcstools/wstool/stargazers","contributors_url":"https://api.github.com/repos/vcstools/wstool/contributors","subscribers_url":"https://api.github.com/repos/vcstools/wstool/subscribers","subscription_url":"https://api.github.com/repos/vcstools/wstool/subscription","commits_url":"https://api.github.com/repos/vcstools/wstool/commits{/sha}","git_commits_url":"https://api.github.com/repos/vcstools/wstool/git/commits{/sha}","comments_url":"https://api.github.com/repos/vcstools/wstool/comments{/number}","issue_comment_url":"https://api.github.com/repos/vcstools/wstool/issues/comments{/number}","contents_url":"https://api.github.com/repos/vcstools/wstool/contents/{+path}","compare_url":"https://api.github.com/repos/vcstools/wstool/compare/{base}...{head}","merges_url":"https://api.github.com/repos/vcstools/wstool/merges","archive_url":"https://api.github.com/repos/vcstools/wstool/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/vcstools/wstool/downloads","issues_url":"https://api.github.com/repos/vcstools/wstool/issues{/number}","pulls_url":"https://api.github.com/repos/vcstools/wstool/pulls{/number}","milestones_url":"https://api.github.com/repos/vcstools/wstool/milestones{/number}","notifications_url":"https://api.github.com/repos/vcstools/wstool/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/vcstools/wstool/labels{/name}","releases_url":"https://api.github.com/repos/vcstools/wstool/releases{/id}","created_at":"2012-11-20T08:54:46Z","updated_at":"2015-03-06T13:41:44Z","pushed_at":"2015-07-13T16:14:18Z","git_url":"git://github.com/vcstools/wstool.git","ssh_url":"git@github.com:vcstools/wstool.git","clone_url":"https://github.com/vcstools/wstool.git","svn_url":"https://github.com/vcstools/wstool","homepage":null,"size":479,"stargazers_count":3,"watchers_count":3,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":11,"mirror_url":null,"open_issues_count":11,"forks":11,"open_issues":11,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/vcstools/wstool/pulls/37"},"html":{"href":"https://github.com/vcstools/wstool/pull/37"},"issue":{"href":"https://api.github.com/repos/vcstools/wstool/issues/37"},"comments":{"href":"https://api.github.com/repos/vcstools/wstool/issues/37/comments"},"review_comments":{"href":"https://api.github.com/repos/vcstools/wstool/pulls/37/comments"},"review_comment":{"href":"https://api.github.com/repos/vcstools/wstool/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/vcstools/wstool/pulls/37/commits"},"statuses":{"href":"https://api.github.com/repos/vcstools/wstool/statuses/3b21c59942bd44732d0e4c3c98cb9850bc83497c"}},"merged":false,"mergeable":true,"mergeable_state":"clean","merged_by":null,"comments":0,"review_comments":0,"commits":1,"additions":14,"deletions":7,"changed_files":2}}