Details
-
Bug
-
Status: Open (View Workflow)
-
Critical
-
Resolution: Unresolved
-
None
-
svn, Version 1.6.17 (r1128011) (client version on jenkins)
SVN/1.6.17 SVNKit/1.3.7-1 (http://svnkit.com/) t20111225_1716 (SVN Server version)
Jenkins ver. 1.488
Jenkins svnmerge plugin 1.2
Description
- Create a project with "Accept Integration from Subversion feature branches"
- SCM setting: check out trunk of a subversion project
- build the trunk project
- Create a feature branch from this project in jenkins (I called it "development")
- build the branch project
- integrate the build in the trunk - works correctly
- change some files in the branch and commit those changes
- build the branch project again
- integrate the new build in the trunk
Gives:
No changes to be integrated. Skipping integration.
Completed
Expected: the modified files are merged into the trunk
Attachments
Activity
Tobias Dittrich
created issue -
Tobias Dittrich
made changes -
| Field | Original Value | New Value |
|---|---|---|
| Description |
# Create a project with "Accept Integration from Subversion feature branches" # check out trunk of a subversion project # build the trunk project # Create a feature branch from this project in jenkins (I called it "development") # build the branch project # integrate the build in the trunk - works correctly # change some files in the branch and commit those changes # build the branch project again # integrate the new build in the trunk Gives: {quote}No changes to be integrated. Skipping integration. Completed{quote} |
# Create a project with "Accept Integration from Subversion feature branches" # SCM setting: check out trunk of a subversion project # build the trunk project # Create a feature branch from this project in jenkins (I called it "development") # build the branch project # integrate the build in the trunk - works correctly # change some files in the branch and commit those changes # build the branch project again # integrate the new build in the trunk Gives: {quote}No changes to be integrated. Skipping integration. Completed{quote} |
Tobias Dittrich
made changes -
| Description |
# Create a project with "Accept Integration from Subversion feature branches" # SCM setting: check out trunk of a subversion project # build the trunk project # Create a feature branch from this project in jenkins (I called it "development") # build the branch project # integrate the build in the trunk - works correctly # change some files in the branch and commit those changes # build the branch project again # integrate the new build in the trunk Gives: {quote}No changes to be integrated. Skipping integration. Completed{quote} |
# Create a project with "Accept Integration from Subversion feature branches" # SCM setting: check out trunk of a subversion project # build the trunk project # Create a feature branch from this project in jenkins (I called it "development") # build the branch project # integrate the build in the trunk - works correctly # change some files in the branch and commit those changes # build the branch project again # integrate the new build in the trunk Gives: {quote}No changes to be integrated. Skipping integration. Completed{quote} Expected: the modified files are merged into the trunk |
| Workflow | JNJira [ 146460 ] | JNJira + In-Review [ 176626 ] |