As of 1.6.0.305, there seems to be a problem with Git repos. When I push some changes to any of my repos, then poll the repo or manually trigger a build, I can see all the new changes, but only against one branch (“master”). They do not appear on the branch which I am actually building (“testing”, in this case), so the changes never make it into the build. The changes have been successfully pushed to testing, but the only way I can get Continua to recognise them is to manually reset the repositories via the CI Server admin page.
cheers,
-StuY
Hi StuY,
We did make some changes in this area, to ensure that we get all changes after a merge of two heads of the same branch. I’ll do some further testing on this today.
Meanwhile it would help our investigation if you could send the output from git log showing the relevant commits to support@finalbuilder.com . The following command line would include the most relevant information: “git log --graph --decorate --source --topo-order --parents -m --all”. You can add “-n X” to limit the number of commits shown.
If you could also enable debug logging and send us the log after reproducing the issue this would help us find the cause of the issue quicker.
Hi Dave,
I’ve noticed that the fix you did made it work seemingly fine for us. However today I noticed an issue with this again, when I did a new branch (‘feature-1’) from HEAD on ‘develop’ branch. The first commit I did on the ‘feature-1’ branch did not show up in the changes, but the rest of it did. As previous it is not something that happens all the time. I am currently on version 1.7.0.80. Unfortunately the guy with login to the server is not here at the moment so I cannot provide you with more info.
//Walliski
Well… My image should link here: http://i.imgur.com/7pGIGnj.png (great paint skills)
Hi Walliski,
Please install v1.7.0.93. This includes a fix for an issue where a changeset on multiple branches would only appear on one branch.
If you still are seeing discrepancies after installing the latest version we would need some further details as we are not able to reproduce this.
Could you write the output of “git log --graph --decorate --source --topo-order --parents -m --all” to a file. Add the argument “-n X” to limit the number of commits to those that are relevant. Run this in your Git local clone folder and send the file to support@finalbuilder.com.
Also enable debug logging and restart the server. If you can then reproduce the issue with a new set of commits, send the debug log to us along with a git log output containing these new commits.
Well the commit was only done in one branch at the moment as you can see from the image I linked, so it should not be a problem with the commit showing up multiple times. In fact after merging with the develop branch the commit appears in develop but still not in the feature branch. But yes, I will probably upgrade sometimes when the guy that has admin access to the server shows up…
And reproducing is difficult as this has happened only once on about 10 feature branches and 100 commits as far as I have noticed.
I am seeing identical symptoms again with v1.8.0.96 and the last 1.7 build that I had installed. Commits are being detected, but only on the master branch, not on the branches that I build. The only workaround seems to be to reset the repos; I need to do this every time I want to make a build.
I will email the same debugging info as before in case that helps.
Cheers,
-Stu