]> source.dussan.org Git - sonarqube.git/commit
SONAR-4309 fix detection of conflicts
authorSimon Brandhof <simon.brandhof@gmail.com>
Tue, 4 Jun 2013 19:47:18 +0000 (21:47 +0200)
committerSimon Brandhof <simon.brandhof@gmail.com>
Tue, 4 Jun 2013 19:47:18 +0000 (21:47 +0200)
commit835b50faabb8b2ccdb0f3b7e1ee01cc0606d4e24
tree5e2d6b8feec011d52449bbc5a84ddc418a2468e9
parent8e170d60dc9462cb12c2a130c013f198c5823ce7
SONAR-4309 fix detection of conflicts
sonar-core/src/main/java/org/sonar/core/issue/db/IssueStorage.java
sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java
sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml [new file with mode: 0644]
sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml [new file with mode: 0644]
sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/DefaultIssue.java