setContentsAndCommit(iFile2, "change in branch - file 2",
"branch commit - file2");
testRepo.checkoutBranch(MASTER);
RemoteResourceMappingContext context = prepareContext(MASTER, BRANCH);
assertFalse(context.hasLocalChange(iFile1, new NullProgressMonitor()));
assertTrue(context.hasRemoteChange(iFile1, new NullProgressMonitor()));
assertFalse(context.hasLocalChange(iFile2, new NullProgressMonitor()));
assertTrue(context.hasRemoteChange(iFile2, new NullProgressMonitor()));
setContents(iFile1, "change in master - file 1");
refresh(context, iFile1);
assertTrue(context.hasLocalChange(iFile1, new NullProgressMonitor()));
assertTrue(context.hasRemoteChange(iFile1, new NullProgressMonitor()));
setContents(iFile2, "change in branch - file 2");
refresh(context, iFile2);
assertTrue(context.hasLocalChange(iFile2, new NullProgressMonitor()));
assertTrue(context.hasRemoteChange(iFile2, new NullProgressMonitor()));
setContentsAndCommit(iFile1, "change in branch - file 1",
"change in master (same as in branch) - file 2");
refresh(context, iFile1);
assertTrue(context.hasLocalChange(iFile1, new NullProgressMonitor()));
assertTrue(context.hasRemoteChange(iFile1, new NullProgressMonitor()));
}