Re: pre-build/tested commits
On 2012-04-11 21:47, Sami Tikka wrote: Probably not. AFAIK there is no way to tell git this branch is now ready and merged and it will never again receive new commits and it can be deleted It is always possible to checkout an old branch and add new commits to it. If you are concerned about the large number of branches in the central repository, you could tell each developer they are allowed to have only 1 branch in there. A developer would always need to merge the feature branch he is working on to his own branch on the central repo. OTOH I'm not sure why the large number of branches would be a problem? Can you explain it? I really can't. We are just now starting up with git. Going from CVS to git is sort of like going from Visual Basic to C++ and I worry that we are going to get our feet shot off. Well, I worried. This quote calmed me down :-) It is easy to shoot your foot off with git, but also easy to revert to a previous foot and merge it with your current leg. —Jack William Bell Thanks for your help, Thomas
Re: pre-build/tested commits
On 2012-04-11 20:14, Thomas Sondergaard wrote: 2. How do you handle the situation, where there is more than one branch undergoing development, ie I may have commits that should be merged to a stable branch and other commits that should be pushed to the master/unstable branch. In both cases I would like jenkins to pre-build before pushing upstream. After getting the basic setup to work I tried changing Branches to build to release4/*, believing that it would then only pick up branches like release4/bug1004 release4/bug1005 and leave other branches alone, but this doesn't seem to work. Just when I thought, I could answer my own question :-/ Thomas
Re: pre-build/tested commits
Regarding your first point: https://www.google.de/search?q=git+delete+remote+branch Basically you delete the branch locally and push an empty branch to your remote. Regards Mirko On Wed, Apr 11, 2012 at 20:14, Thomas Sondergaard t...@medical-insight.com wrote: The section Using Git, Jenkins and pre-build branch merging in the Jenkins Git Plugin page describes how we can make jenkins merge changes on a feature branch to a development branch, run the build and then finally push the changes to the central repository. I'd like to use this, but I have some questions. I'm new to git, so I may have gotten some of the words wrong. 1. This must lead to a large number of branches in the central repository. Is there a way to delete branches which have been fully merged to other branches? 2. How do you handle the situation, where there is more than one branch undergoing development, ie I may have commits that should be merged to a stable branch and other commits that should be pushed to the master/unstable branch. In both cases I would like jenkins to pre-build before pushing upstream. Thanks, Thomas
Re: pre-build/tested commits
I meant, is there a way to automate it? On 2012-04-11 20:48, Mirko Friedenhagen wrote: Regarding your first point: https://www.google.de/search?q=git+delete+remote+branch Basically you delete the branch locally and push an empty branch to your remote. Regards Mirko On Wed, Apr 11, 2012 at 20:14, Thomas Sondergaard t...@medical-insight.com wrote: The section Using Git, Jenkins and pre-build branch merging in the Jenkins Git Plugin page describes how we can make jenkins merge changes on a feature branch to a development branch, run the build and then finally push the changes to the central repository. I'd like to use this, but I have some questions. I'm new to git, so I may have gotten some of the words wrong. 1. This must lead to a large number of branches in the central repository. Is there a way to delete branches which have been fully merged to other branches? 2. How do you handle the situation, where there is more than one branch undergoing development, ie I may have commits that should be merged to a stable branch and other commits that should be pushed to the master/unstable branch. In both cases I would like jenkins to pre-build before pushing upstream. Thanks, Thomas
