void (HgRevisionNumber incomingHead, HgRevisionNumber headBeforeUpdate) { List<HgRevisionNumber> newHeads = new HgHeadsCommand(myProject, projectRepoVirtualFile).executeInCurrentThread(); assertEquals("After updating, there should be only one head because the remote heads should have been merged", 1, newHeads.size()); HgRevisionNumber newHead = newHeads.get(0); HgParentsCommand parents = new HgParentsCommand(myProject); parents.setRevision(newHead); List<HgRevisionNumber> parentRevisions = parents.executeInCurrentThread(projectRepoVirtualFile); assertEquals(2, parentRevisions.size()); assertTrue(parentRevisions.contains(incomingHead)); assertTrue(parentRevisions.contains(headBeforeUpdate)); }