{"action":"created","comment":{"url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/comments/70835714","id":70835714,"diff_hunk":"@@ -231,6 +231,28 @@ class FILEPERSISTENCE_API TwoChangesSameList_LabelCycleResolvable\n \tCHECK_CONDITION(tree->find(QUuid{\"{00000000-0000-0000-0000-000000000206}\"}));\n }};\n \n+class FILEPERSISTENCE_API TwoChangesSameList_DelInsNodes\n+ : public SelfTest::Test<FilePersistencePlugin, TwoChangesSameList_DelInsNodes> { public: void test()\n+{\n+\tVCTestProject p{\"TestMerge_\"+this->getName(), \"TestMerge\"};\n+\tauto merge = p.repo().merge(\"dev\");\n+\tSignature sig;\n+\tsig.name_ = \"Chuck TESTa\";\n+\tsig.eMail_ = \"chuck@mergetest.com\";\n+\tQ_ASSERT(!merge->isAlreadyMerged());\n+\tmerge->commit(sig, sig, \"This is the result of merge test \\\"TwoChangesSameList_DelInsNodes\\\"\");\n+\tauto tree = merge->mergedTree();\n+\tCHECK_CONDITION(!merge->hasConflicts());\n+\tCHECK_CONDITION(!tree->find(QUuid{\"{00000000-0000-0000-0000-00000000020b}\"}));\n+\tCHECK_CONDITION(!tree->find(QUuid{\"{00000000-0000-0000-0000-00000000020c}\"}));\n+\tCHECK_CONDITION(tree->find(QUuid{\"{00000000-0000-0000-0000-00000000020f}\"}));\n+\tCHECK_CONDITION(tree->find(QUuid{\"{00000000-0000-0000-0000-00000000020e}\"}));\n+\tCHECK_CONDITION(tree->find(QUuid{\"{00000000-0000-0000-0000-00000000020a}\"})->label().toInt() == 1);","path":"FilePersistence/test/VersionControlMergetests.cpp","position":20,"original_position":20,"commit_id":"f7678dfbb8795c3e7c9facac827a5a99be85b03f","original_commit_id":"f7678dfbb8795c3e7c9facac827a5a99be85b03f","user":{"login":"dimitar-asenov","id":1152976,"avatar_url":"https://avatars.githubusercontent.com/u/1152976?v=3","gravatar_id":"","url":"https://api.github.com/users/dimitar-asenov","html_url":"https://github.com/dimitar-asenov","followers_url":"https://api.github.com/users/dimitar-asenov/followers","following_url":"https://api.github.com/users/dimitar-asenov/following{/other_user}","gists_url":"https://api.github.com/users/dimitar-asenov/gists{/gist_id}","starred_url":"https://api.github.com/users/dimitar-asenov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dimitar-asenov/subscriptions","organizations_url":"https://api.github.com/users/dimitar-asenov/orgs","repos_url":"https://api.github.com/users/dimitar-asenov/repos","events_url":"https://api.github.com/users/dimitar-asenov/events{/privacy}","received_events_url":"https://api.github.com/users/dimitar-asenov/received_events","type":"User","site_admin":false},"body":"Use `CHECK_INT_EQUAL` instead. It provides better error messages in case of failure.","created_at":"2016-07-14T16:19:04Z","updated_at":"2016-07-14T16:19:04Z","html_url":"https://github.com/dimitar-asenov/Envision/pull/424#discussion_r70835714","pull_request_url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424","_links":{"self":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/comments/70835714"},"html":{"href":"https://github.com/dimitar-asenov/Envision/pull/424#discussion_r70835714"},"pull_request":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424"}}},"pull_request":{"url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424","id":77476229,"html_url":"https://github.com/dimitar-asenov/Envision/pull/424","diff_url":"https://github.com/dimitar-asenov/Envision/pull/424.diff","patch_url":"https://github.com/dimitar-asenov/Envision/pull/424.patch","issue_url":"https://api.github.com/repos/dimitar-asenov/Envision/issues/424","number":424,"state":"open","locked":false,"title":"Add test case Deletion+Insertion of nodes(at same position) by both versions","user":{"login":"Vaishal-shah","id":11445667,"avatar_url":"https://avatars.githubusercontent.com/u/11445667?v=3","gravatar_id":"","url":"https://api.github.com/users/Vaishal-shah","html_url":"https://github.com/Vaishal-shah","followers_url":"https://api.github.com/users/Vaishal-shah/followers","following_url":"https://api.github.com/users/Vaishal-shah/following{/other_user}","gists_url":"https://api.github.com/users/Vaishal-shah/gists{/gist_id}","starred_url":"https://api.github.com/users/Vaishal-shah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vaishal-shah/subscriptions","organizations_url":"https://api.github.com/users/Vaishal-shah/orgs","repos_url":"https://api.github.com/users/Vaishal-shah/repos","events_url":"https://api.github.com/users/Vaishal-shah/events{/privacy}","received_events_url":"https://api.github.com/users/Vaishal-shah/received_events","type":"User","site_admin":false},"body":"It was resolved in applyNonConflicting changes component\n<a href='#crh-start'></a><a href='#crh-data-%7B%22processed%22%3A%20%5B%22https%3A//github.com/dimitar-asenov/Envision/pull/424%23issuecomment-232702779%22%2C%20%22https%3A//github.com/dimitar-asenov/Envision/pull/424%23discussion_r70833576%22%5D%2C%20%22comments%22%3A%20%7B%22General%20Comment%22%3A%20%7B%22html_url%22%3A%20%22https%3A//github.com/dimitar-asenov/Envision/pull/424%23issuecomment-232702779%22%2C%20%22comments%22%3A%20%5B%7B%22body%22%3A%20%22This%20is%20no%20rename.%20This%20is%20delete%2Binsert.%20Please%20adjust%20the%20commit%27s%20comments%20and%20filenames%20to%20reflect%20this.%22%2C%20%22created_at%22%3A%20%222016-07-14T15%3A38%3A42Z%22%2C%20%22user%22%3A%20%7B%22avatar_url%22%3A%20%22https%3A//avatars.githubusercontent.com/u/1152976%3Fv%3D3%22%2C%20%22html_url%22%3A%20%22https%3A//github.com/dimitar-asenov%22%7D%7D%5D%2C%20%22title%22%3A%20%22General%20Comment%22%7D%2C%20%22Pull%20064e44598b10c11e0734108f7f6fe0248fa6cb73%20FilePersistence/test/VersionControlMergetests.cpp%2019%22%3A%20%7B%22html_url%22%3A%20%22https%3A//github.com/dimitar-asenov/Envision/pull/424%23discussion_r70833576%22%2C%20%22comments%22%3A%20%5B%7B%22body%22%3A%20%22Could%20you%20perhaps%20add%20a%20few%20more%20checks%20for%20the%20inserted%20tree%3F%20For%20example%20once%20you%20find%20the%20two%20new%20inserted%20nodes%2C%20check%20their%20labels.%20They%20should%20match%20your%20expectations.%22%2C%20%22created_at%22%3A%20%222016-07-14T16%3A05%3A28Z%22%2C%20%22user%22%3A%20%7B%22avatar_url%22%3A%20%22https%3A//avatars.githubusercontent.com/u/1152976%3Fv%3D3%22%2C%20%22html_url%22%3A%20%22https%3A//github.com/dimitar-asenov%22%7D%7D%5D%2C%20%22title%22%3A%20%22File%3A%20FilePersistence/test/VersionControlMergetests.cpp%3AL231-255%22%7D%7D%7D'></a>\n<a href='https://www.codereviewhub.com/'><img src='http://www.codereviewhub.com/site/github-bar.png' height=40></a>\n- [x] <a href='#crh-comment-General Comment'></a> <img src='http://www.codereviewhub.com/site/github-remaining.png' height=16 width=60>&nbsp;<b><a href='https://github.com/dimitar-asenov/Envision/pull/424#issuecomment-232702779'>General Comment</a></b>\n- <a href='https://github.com/dimitar-asenov'><img border=0 src='https://avatars.githubusercontent.com/u/1152976?v=3' height=16 width=16'></a> This is no rename. This is delete+insert. Please adjust the commit's comments and filenames to reflect this.\n- [ ] <a href='#crh-comment-Pull 064e44598b10c11e0734108f7f6fe0248fa6cb73 FilePersistence/test/VersionControlMergetests.cpp 19'></a> <img src='http://www.codereviewhub.com/site/github-remaining.png' height=16 width=60>&nbsp;<b><a href='https://github.com/dimitar-asenov/Envision/pull/424#discussion_r70833576'>File: FilePersistence/test/VersionControlMergetests.cpp:L231-255</a></b>\n- <a href='https://github.com/dimitar-asenov'><img border=0 src='https://avatars.githubusercontent.com/u/1152976?v=3' height=16 width=16'></a> Could you perhaps add a few more checks for the inserted tree? For example once you find the two new inserted nodes, check their labels. They should match your expectations.\n\n\n<a href='https://www.codereviewhub.com/dimitar-asenov/Envision/pull/424?mark_as_completed=1'><img src='http://www.codereviewhub.com/site/github-mark-as-completed.png' height=26></a>&nbsp;<a href='https://www.codereviewhub.com/dimitar-asenov/Envision/pull/424?approve=1'><img src='http://www.codereviewhub.com/site/github-approve.png' height=26></a>&nbsp;<a href='https://github.com/dimitar-asenov/Envision/pull/424'><img src='http://www.codereviewhub.com/site/github-refresh.png' height=26></a>\n<a href='#crh-end'></a>","created_at":"2016-07-14T15:30:19Z","updated_at":"2016-07-14T16:19:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"a274a78ca5f6a9c7dea6b4af22159c1a8c2a3342","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424/commits","review_comments_url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424/comments","review_comment_url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/comments{/number}","comments_url":"https://api.github.com/repos/dimitar-asenov/Envision/issues/424/comments","statuses_url":"https://api.github.com/repos/dimitar-asenov/Envision/statuses/f7678dfbb8795c3e7c9facac827a5a99be85b03f","head":{"label":"Vaishal-shah:mergebranch","ref":"mergebranch","sha":"f7678dfbb8795c3e7c9facac827a5a99be85b03f","user":{"login":"Vaishal-shah","id":11445667,"avatar_url":"https://avatars.githubusercontent.com/u/11445667?v=3","gravatar_id":"","url":"https://api.github.com/users/Vaishal-shah","html_url":"https://github.com/Vaishal-shah","followers_url":"https://api.github.com/users/Vaishal-shah/followers","following_url":"https://api.github.com/users/Vaishal-shah/following{/other_user}","gists_url":"https://api.github.com/users/Vaishal-shah/gists{/gist_id}","starred_url":"https://api.github.com/users/Vaishal-shah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vaishal-shah/subscriptions","organizations_url":"https://api.github.com/users/Vaishal-shah/orgs","repos_url":"https://api.github.com/users/Vaishal-shah/repos","events_url":"https://api.github.com/users/Vaishal-shah/events{/privacy}","received_events_url":"https://api.github.com/users/Vaishal-shah/received_events","type":"User","site_admin":false},"repo":{"id":57876555,"name":"Envision","full_name":"Vaishal-shah/Envision","owner":{"login":"Vaishal-shah","id":11445667,"avatar_url":"https://avatars.githubusercontent.com/u/11445667?v=3","gravatar_id":"","url":"https://api.github.com/users/Vaishal-shah","html_url":"https://github.com/Vaishal-shah","followers_url":"https://api.github.com/users/Vaishal-shah/followers","following_url":"https://api.github.com/users/Vaishal-shah/following{/other_user}","gists_url":"https://api.github.com/users/Vaishal-shah/gists{/gist_id}","starred_url":"https://api.github.com/users/Vaishal-shah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vaishal-shah/subscriptions","organizations_url":"https://api.github.com/users/Vaishal-shah/orgs","repos_url":"https://api.github.com/users/Vaishal-shah/repos","events_url":"https://api.github.com/users/Vaishal-shah/events{/privacy}","received_events_url":"https://api.github.com/users/Vaishal-shah/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Vaishal-shah/Envision","description":"A next generation IDE with a visual programming interface","fork":true,"url":"https://api.github.com/repos/Vaishal-shah/Envision","forks_url":"https://api.github.com/repos/Vaishal-shah/Envision/forks","keys_url":"https://api.github.com/repos/Vaishal-shah/Envision/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Vaishal-shah/Envision/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Vaishal-shah/Envision/teams","hooks_url":"https://api.github.com/repos/Vaishal-shah/Envision/hooks","issue_events_url":"https://api.github.com/repos/Vaishal-shah/Envision/issues/events{/number}","events_url":"https://api.github.com/repos/Vaishal-shah/Envision/events","assignees_url":"https://api.github.com/repos/Vaishal-shah/Envision/assignees{/user}","branches_url":"https://api.github.com/repos/Vaishal-shah/Envision/branches{/branch}","tags_url":"https://api.github.com/repos/Vaishal-shah/Envision/tags","blobs_url":"https://api.github.com/repos/Vaishal-shah/Envision/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Vaishal-shah/Envision/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Vaishal-shah/Envision/git/refs{/sha}","trees_url":"https://api.github.com/repos/Vaishal-shah/Envision/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Vaishal-shah/Envision/statuses/{sha}","languages_url":"https://api.github.com/repos/Vaishal-shah/Envision/languages","stargazers_url":"https://api.github.com/repos/Vaishal-shah/Envision/stargazers","contributors_url":"https://api.github.com/repos/Vaishal-shah/Envision/contributors","subscribers_url":"https://api.github.com/repos/Vaishal-shah/Envision/subscribers","subscription_url":"https://api.github.com/repos/Vaishal-shah/Envision/subscription","commits_url":"https://api.github.com/repos/Vaishal-shah/Envision/commits{/sha}","git_commits_url":"https://api.github.com/repos/Vaishal-shah/Envision/git/commits{/sha}","comments_url":"https://api.github.com/repos/Vaishal-shah/Envision/comments{/number}","issue_comment_url":"https://api.github.com/repos/Vaishal-shah/Envision/issues/comments{/number}","contents_url":"https://api.github.com/repos/Vaishal-shah/Envision/contents/{+path}","compare_url":"https://api.github.com/repos/Vaishal-shah/Envision/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Vaishal-shah/Envision/merges","archive_url":"https://api.github.com/repos/Vaishal-shah/Envision/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Vaishal-shah/Envision/downloads","issues_url":"https://api.github.com/repos/Vaishal-shah/Envision/issues{/number}","pulls_url":"https://api.github.com/repos/Vaishal-shah/Envision/pulls{/number}","milestones_url":"https://api.github.com/repos/Vaishal-shah/Envision/milestones{/number}","notifications_url":"https://api.github.com/repos/Vaishal-shah/Envision/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Vaishal-shah/Envision/labels{/name}","releases_url":"https://api.github.com/repos/Vaishal-shah/Envision/releases{/id}","deployments_url":"https://api.github.com/repos/Vaishal-shah/Envision/deployments","created_at":"2016-05-02T09:00:15Z","updated_at":"2016-05-02T09:00:21Z","pushed_at":"2016-07-14T16:15:36Z","git_url":"git://github.com/Vaishal-shah/Envision.git","ssh_url":"git@github.com:Vaishal-shah/Envision.git","clone_url":"https://github.com/Vaishal-shah/Envision.git","svn_url":"https://github.com/Vaishal-shah/Envision","homepage":"http://dimitar-asenov.github.com/Envision/","size":66758,"stargazers_count":0,"watchers_count":0,"language":"C++","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":"development"}},"base":{"label":"dimitar-asenov:development","ref":"development","sha":"7ee7c427a87480ba38b8ddb5f96c094777fa82b1","user":{"login":"dimitar-asenov","id":1152976,"avatar_url":"https://avatars.githubusercontent.com/u/1152976?v=3","gravatar_id":"","url":"https://api.github.com/users/dimitar-asenov","html_url":"https://github.com/dimitar-asenov","followers_url":"https://api.github.com/users/dimitar-asenov/followers","following_url":"https://api.github.com/users/dimitar-asenov/following{/other_user}","gists_url":"https://api.github.com/users/dimitar-asenov/gists{/gist_id}","starred_url":"https://api.github.com/users/dimitar-asenov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dimitar-asenov/subscriptions","organizations_url":"https://api.github.com/users/dimitar-asenov/orgs","repos_url":"https://api.github.com/users/dimitar-asenov/repos","events_url":"https://api.github.com/users/dimitar-asenov/events{/privacy}","received_events_url":"https://api.github.com/users/dimitar-asenov/received_events","type":"User","site_admin":false},"repo":{"id":2650576,"name":"Envision","full_name":"dimitar-asenov/Envision","owner":{"login":"dimitar-asenov","id":1152976,"avatar_url":"https://avatars.githubusercontent.com/u/1152976?v=3","gravatar_id":"","url":"https://api.github.com/users/dimitar-asenov","html_url":"https://github.com/dimitar-asenov","followers_url":"https://api.github.com/users/dimitar-asenov/followers","following_url":"https://api.github.com/users/dimitar-asenov/following{/other_user}","gists_url":"https://api.github.com/users/dimitar-asenov/gists{/gist_id}","starred_url":"https://api.github.com/users/dimitar-asenov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dimitar-asenov/subscriptions","organizations_url":"https://api.github.com/users/dimitar-asenov/orgs","repos_url":"https://api.github.com/users/dimitar-asenov/repos","events_url":"https://api.github.com/users/dimitar-asenov/events{/privacy}","received_events_url":"https://api.github.com/users/dimitar-asenov/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/dimitar-asenov/Envision","description":"A next generation IDE with a visual programming interface","fork":false,"url":"https://api.github.com/repos/dimitar-asenov/Envision","forks_url":"https://api.github.com/repos/dimitar-asenov/Envision/forks","keys_url":"https://api.github.com/repos/dimitar-asenov/Envision/keys{/key_id}","collaborators_url":"https://api.github.com/repos/dimitar-asenov/Envision/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/dimitar-asenov/Envision/teams","hooks_url":"https://api.github.com/repos/dimitar-asenov/Envision/hooks","issue_events_url":"https://api.github.com/repos/dimitar-asenov/Envision/issues/events{/number}","events_url":"https://api.github.com/repos/dimitar-asenov/Envision/events","assignees_url":"https://api.github.com/repos/dimitar-asenov/Envision/assignees{/user}","branches_url":"https://api.github.com/repos/dimitar-asenov/Envision/branches{/branch}","tags_url":"https://api.github.com/repos/dimitar-asenov/Envision/tags","blobs_url":"https://api.github.com/repos/dimitar-asenov/Envision/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/dimitar-asenov/Envision/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/dimitar-asenov/Envision/git/refs{/sha}","trees_url":"https://api.github.com/repos/dimitar-asenov/Envision/git/trees{/sha}","statuses_url":"https://api.github.com/repos/dimitar-asenov/Envision/statuses/{sha}","languages_url":"https://api.github.com/repos/dimitar-asenov/Envision/languages","stargazers_url":"https://api.github.com/repos/dimitar-asenov/Envision/stargazers","contributors_url":"https://api.github.com/repos/dimitar-asenov/Envision/contributors","subscribers_url":"https://api.github.com/repos/dimitar-asenov/Envision/subscribers","subscription_url":"https://api.github.com/repos/dimitar-asenov/Envision/subscription","commits_url":"https://api.github.com/repos/dimitar-asenov/Envision/commits{/sha}","git_commits_url":"https://api.github.com/repos/dimitar-asenov/Envision/git/commits{/sha}","comments_url":"https://api.github.com/repos/dimitar-asenov/Envision/comments{/number}","issue_comment_url":"https://api.github.com/repos/dimitar-asenov/Envision/issues/comments{/number}","contents_url":"https://api.github.com/repos/dimitar-asenov/Envision/contents/{+path}","compare_url":"https://api.github.com/repos/dimitar-asenov/Envision/compare/{base}...{head}","merges_url":"https://api.github.com/repos/dimitar-asenov/Envision/merges","archive_url":"https://api.github.com/repos/dimitar-asenov/Envision/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/dimitar-asenov/Envision/downloads","issues_url":"https://api.github.com/repos/dimitar-asenov/Envision/issues{/number}","pulls_url":"https://api.github.com/repos/dimitar-asenov/Envision/pulls{/number}","milestones_url":"https://api.github.com/repos/dimitar-asenov/Envision/milestones{/number}","notifications_url":"https://api.github.com/repos/dimitar-asenov/Envision/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/dimitar-asenov/Envision/labels{/name}","releases_url":"https://api.github.com/repos/dimitar-asenov/Envision/releases{/id}","deployments_url":"https://api.github.com/repos/dimitar-asenov/Envision/deployments","created_at":"2011-10-26T12:03:58Z","updated_at":"2016-05-29T16:14:32Z","pushed_at":"2016-07-14T16:15:36Z","git_url":"git://github.com/dimitar-asenov/Envision.git","ssh_url":"git@github.com:dimitar-asenov/Envision.git","clone_url":"https://github.com/dimitar-asenov/Envision.git","svn_url":"https://github.com/dimitar-asenov/Envision","homepage":"http://dimitar-asenov.github.com/Envision/","size":69609,"stargazers_count":28,"watchers_count":28,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":18,"mirror_url":null,"open_issues_count":30,"forks":18,"open_issues":30,"watchers":28,"default_branch":"development"}},"_links":{"self":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424"},"html":{"href":"https://github.com/dimitar-asenov/Envision/pull/424"},"issue":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/issues/424"},"comments":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/issues/424/comments"},"review_comments":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424/comments"},"review_comment":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/pulls/424/commits"},"statuses":{"href":"https://api.github.com/repos/dimitar-asenov/Envision/statuses/f7678dfbb8795c3e7c9facac827a5a99be85b03f"}}}}
{"actor":{"display_login":"dimitar-asenov"}}