| Chunk |
|---|
| Conflicting content |
|---|
boolean dirtyWorkspace = p4workspace.isDirty();
saveWorkspaceIfDirty(depot, p4workspace, log);
<<<<<<< HEAD
//Wipe/clean workspace
String p4config = substituteParameters("${P4CONFIG}", build);
WipeWorkspaceExcludeFilter wipeFilter = new WipeWorkspaceExcludeFilter(".p4config",p4config);
if(wipeBeforeBuild || quickCleanBeforeBuild){
if(wipeRepoBeforeBuild){
log.println("Clear workspace includes .repository ...");
=======
if(wipeBeforeBuild){
log.println("Clearing workspace...");
String p4config = substituteParameters("${P4CONFIG}", build);
WipeWorkspaceExcludeFilter wipeFilter = new WipeWorkspaceExcludeFilter(".p4config",p4config);
if(wipeRepoBeforeBuild){
log.println("Clear workspace includes .repository ...");
>>>>>>> b756e3b68662c0fa35f0e70172743cfc4f330ee2
} else {
log.println("Note: .repository directory in workspace (if exists) is skipped during clean.");
wipeFilter.exclude(".repository"); |
| Solution content |
|---|
boolean dirtyWorkspace = p4workspace.isDirty();
saveWorkspaceIfDirty(depot, p4workspace, log);
//Wipe/clean workspace
String p4config = substituteParameters("${P4CONFIG}", build);
WipeWorkspaceExcludeFilter wipeFilter = new WipeWorkspaceExcludeFilter(".p4config",p4config);
if(wipeBeforeBuild || quickCleanBeforeBuild){
if(wipeRepoBeforeBuild){
log.println("Clear workspace includes .repository ...");
} else {
log.println("Note: .repository directory in workspace (if exists) is skipped during clean.");
wipeFilter.exclude(".repository"); |
| File |
|---|
| PerforceSCM.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
log.println("Wiped workspace.");
forceSync = true;
}
<<<<<<< HEAD
if(quickCleanBeforeBuild){
log.println("Quickly cleaning workspace...");
(new QuickCleaner(depot.getExecutable(), launcher, depot, workspace, wipeFilter)).exec();
log.println("Workspace is clean.");
}
=======
>>>>>>> b756e3b68662c0fa35f0e70172743cfc4f330ee2
//In case of a stream depot, we want Perforce to handle the client views. So let's re-initialize
//the p4workspace object if it was changed since the last build. Also, populate projectPath with
//the current view from Perforce. We need it for labeling. |
| Solution content |
|---|
log.println("Wiped workspace.");
forceSync = true;
}
if(quickCleanBeforeBuild){
log.println("Quickly cleaning workspace...");
(new QuickCleaner(depot.getExecutable(), launcher, depot, workspace, wipeFilter)).exec();
log.println("Workspace is clean.");
}
//In case of a stream depot, we want Perforce to handle the client views. So let's re-initialize
//the p4workspace object if it was changed since the last build. Also, populate projectPath with
//the current view from Perforce. We need it for labeling. |
| File |
|---|
| PerforceSCM.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |