#37 Based on pull request started by @zilmTT#38
Open
zhibek wants to merge 4 commits intojenkinsci:masterfrom
Open
#37 Based on pull request started by @zilmTT#38zhibek wants to merge 4 commits intojenkinsci:masterfrom
zhibek wants to merge 4 commits intojenkinsci:masterfrom
Conversation
If the deletion and adding path share some characters the contains() function succeed and removes the added path. It should be checked if they are equal. This fixes some rename issues we discovered in our environment.
Before deleting the job hierarchy it is needed to check for changes on the files, e.g config.xml. While deleting a job it gets updated, this blocks the git -rm command from deleting this hierarchy. Commits should always come with proper messages, git command fails if the commit message is empty. Which put scm-sync in an dirty state if there are commits which cannot be pushed.
As i encountered some copy issues, e.g was not able to copy blank build/ dir, i implemented a basic filter for the FileUtil.copy function. This matches on any XML-File and on includes specified on ManualIncludes list from scm-sync-configuration.
Conflicts: src/main/java/hudson/plugins/scm_sync_configuration/SCMManipulator.java src/main/java/hudson/plugins/scm_sync_configuration/ScmSyncConfigurationBusiness.java src/main/java/hudson/plugins/scm_sync_configuration/ScmSyncConfigurationPlugin.java
Member
|
Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests. |
Member
|
What about merging this? |
|
@rodrigc can you merge this? |
mnencia
suggested changes
Nov 2, 2016
Contributor
mnencia
left a comment
mnencia
left a comment
There was a problem hiding this comment.
This pull request is full of white space changes. It's very unlikely that it will be approved with all this unrelated changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-pushing previous merge from @zilmTT as a starting point, so the CI errors can be reviewed (the last CI job showing the errors has expired).