[JIRA] (JENKINS-14551) an update which contains added files merged from a branch results in those files having doubled content

Chris Withers created JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Issue Type:	Bug
Affects Versions:	current
Assignee:	Unassigned
Components:	subversion
Created:	24/Jul/12 12:08 PM
Description:	Using the "Emulate clean checkout by first deleting unversioned/ignored files, then 'svn update'" svn strategy, we recently had a branch merged into trunk that added some files. When the Jenkins jobs configured as above ran against trunk, those added files had their content duplicated. A quick google suggested it has happened before: http://grokbase.com/p/lucene/dev/126m8fpw9q/jenkins-lucene-solr-tests-only-4-x-build-137-still-failing
Environment:	sles 11, Jenkins 1.470, subversion server is CollabNet Subversion Edge 1.3.1
Project:	Jenkins
Priority:	Major
Reporter:	Chris Withers

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

James Scott commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Having the same problem. Jenkins 1.479, Jenkins Subversion Plugin 1.42

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

Ben XO commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Seeing this on Jenkins 1.479 with plugin 1.42 as well.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

 

Ben XO edited a comment on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Seeing this on Jenkins 1.479 with plugin 1.42 as well. Worth noting that at Last.fm we merge down branches which add files quite often, but this behaviour only started happening recently when we upgraded. Probably within the last few point versions of the plugin.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

kutzi commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

So this only happens with the mentioned svn strategy?

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

James Scott commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

It happens also when using 'use svn update as much as possible'. When the build fails we wipeout the workspace and re-build.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

dup2 commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Same issue here, Jenkins 1.485, Jenkins Subversion Plugin 1.43

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

JarnTang commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

I have same issue,Jenkins 1.459 ,subversion plugin 1.43

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

Jan Zuchhold commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

As this bug is really annoying i've created a 50$ reward to fix this, expires Nov/09/2012: http://www.freedomsponsors.org/core/issue/61/an-update-which-contains-added-files-merged-from-a-branch-results-in-those-files-having-doubled-content

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

Patrick Streicher commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Same issue: Jenkins 1.487, Jenkins Subversion Plug-in 1.43

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

Andrea Curtoni commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Same issue: Jenkins 1.489, Jenkins Subversion Plug-in 1.43 (it was already bugged in previous versions)

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

LuFrija commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Same for me. Jenkins 1.424.2 and Subversion plugin 1.43.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

ingmartinlopez commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Same for me. (It's really annoying!). Jenkins 1.492 and Subversion 1.43

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

 

Patrick Streicher edited a comment on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Same issue: Jenkins 1.487, Jenkins Subversion Plug-in 1.43 It occurs always after a merge from a branch. I'm using the "Use 'svn update' as much as possible" check-out strategy.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

kutzi commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

I'm not sure that I understand the issue: Who or what is merging the branch into trunk? And what if you checkout the trunk with command line svn - is the content duplicated, too?

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

Chris Withers commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

The problems happens if, in a commit which already committed to the subversion server, a branch has been merged into trunk that where some files are added. Who or what is merging the branch into trunk? A developer, on their own machine, which is then committed to svn. And what if you checkout the trunk with command line svn - is the content duplicated, too? no, if you use the command line tools, the checkout is as expected, with no duplicated content.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

kutzi commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

Okay. So what would really help to debug the issue would be if you could create a minimal subversion repository which has this characteristics. Ideally also a snapshot of the repository BEFORE and AFTER the branch has been merged.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

vasyl vuy commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

I have the same issue, file content is duplicated. update strategy is 'emulate clean...' and I only see this behavior when new files are added after merge.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

sseidel commented on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

How to reproduce: Do this on the Jenkins host: cd /tmp mkdir svn ws svnadmin create svn svn mkdir file:///tmp/svn/trunk -m trunk svn mkdir file:///tmp/svn/branch -m branch cd ws svn co file:///tmp/svn/trunk svn co file:///tmp/svn/branch cd branch echo test > singleline svn add singleline svn commit -m added cd ../trunk Now create a Jenkins "freestyle" project with SVN URL file:///tmp/svn/trunk and build it once, then continue in the shell: svn merge -r 2:3 ../branch/ svn commit -m merged Now build the project again. Check the workspace, the file "singleline" will contain 2 lines!

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

 

sseidel edited a comment on JENKINS-14551

an update which contains added files merged from a branch results in those files having doubled content

How to reproduce: Do this on the Jenkins host: cd /tmp mkdir svn ws svnadmin create svn svn mkdir file:///tmp/svn/trunk -m trunk svn mkdir file:///tmp/svn/branch -m branch cd ws svn co file:///tmp/svn/branch cd branch echo test > singleline svn add singleline svn commit -m added Now create a Jenkins "freestyle" project with SVN URL file:///tmp/svn/trunk and build it once, then continue in the shell: cd /tmp/ws svn co file:///tmp/svn/trunk cd trunk svn merge -r 2:3 ../branch/ svn commit -m merged Now build the project again. Check the workspace, the file "singleline" will contain 2 lines!

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/groups/opt_out.