Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue when checking for conflicts in Synergy 7.1 #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue when checking for conflicts in Synergy 7.1 #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/hudson/plugins/synergy/impl/ProjectConflicts.java
View file
Open in desktop
Expand Up @@ -33,7 +33,12 @@ public void parseResult(String result) {
line = line.trim();
if((line.indexOf("Conflict detection completed") == -1) &&
(line.indexOf("Finding objects that are not included") == -1) &&
(line.indexOf("Collecting objects and tasks beyond baseline") == -1))
(line.indexOf("Collecting objects and tasks beyond baseline") == -1) &&
// the following lines are needed using Synergy 7.1; these lines occure sporadically!
(line.indexOf("%...") == -1) && // lines like "0%..."
(line.indexOf("Getting explicitly included objects.") == -1) &&
(line.indexOf("Getting members of baseline project.") == -1) &&
(line.indexOf("Checking for missing fix tasks.") == -1))
{
if (line.length()!=0 && !line.startsWith("Project:") && line.indexOf("No conflicts detected")==-1) {

Expand Down