We are using github as a repo and have a build using the gatekeeper that was merging changes from our ci branch into our staging branch. This was working properly, but now seems to have stopped merging any changes.
Here is what git log shows for the ci branch:
Date: Fri Sep 14 09:33:26 2012 -0500
Author: Byron Appelt
Date: Thu Sep 13 12:23:43 2012 -0500
changes to manage new and legacy style daemons
Merge: f672aba cd8e479
Author: Byron Appelt
Date: Tue Sep 11 14:00:09 2012 -0500
Merge branch 'ci' of github.com:numerex/puppet into ci
Author: Byron Appelt <email@example.com>
Date: Tue Sep 11 13:57:55 2012 -0500
added cnf file
And here is a snippet from the build log (attached):
simple 14-Sep-2012 14:34:15 Checking out revision 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061.
simple 14-Sep-2012 14:34:15 Creating local git repository in '/disk1/Bamboo/xml-data/build-dir/PUPPET-MAIN1-JOB1/.git'.
simple 14-Sep-2012 14:34:15 /usr/bin/git log -1 --format=%d --decorate=full 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061
simple 14-Sep-2012 14:34:16 /usr/bin/git checkout -f staging
simple 14-Sep-2012 14:34:16 Already on 'staging'
simple 14-Sep-2012 14:34:16 Merging code from PUPPET-MAIN1-JOB1, revision 9ab1058e9c9de6aa148449e798feb63c71dda554
simple 14-Sep-2012 14:34:18 Merged new changesets from PUPPET-MAIN1-JOB1
simple 14-Sep-2012 14:34:18 Updated source code to revision: 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061
As you can see, it appears to check out 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061 and merge changes from 9ab1058e9c9de6aa148449e798feb63c71dda554, which seems correct, but then it says it is updating to the older 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061 and no changes ever get pushed on the staging branch.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Meet @Dinesh Dhinakaran, @Vishnu Vasudeva, @Rajeev Verma, and Jamshid Nalakath: Our extraordinary AUG leaders from Bengaluru, India. These four work together to strengthen the bonds of their local co...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs