We knew this intuitively, but didn't know why. I'm quite sure that dev releases never get rebuilt because it just does a "git checkout 7.x-1.x". But there's already a local 7.x-1.x. So it doesn't get pulled. Better a fetch followed by "git checkout origin/7.x-1.x" or something.

CommentFileSizeAuthor
#7 project_dependency.deleting_branches_1992752_06.patch3.29 KBrcross
#6 project_dependency.deleting_branches_1992752_05.patch3.28 KBrcross
#4 project_dependency.deleting_branches_1992752_04.patch2.44 KBrfay
#3 project_dependency.deleting_branches_1992752_03.patch2.44 KBrfay
#2 project_dependency.try_harder_deleting_branches.1992752_02.patch1 KBrfay
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented

Ah but I see we already have this code which was meant to do this:

// Make sure we don't have an existing branch by this name, or it won't be updated properly
  exec("git --work-tree=$work_tree --git-dir $esc_git_dir branch -D $tag 2>&1", $output, $status);

The problem is that that code will never work if we're *on* that branch.

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
Version: 7.x-1.x-dev » 6.x-1.x-dev
Status: Active » Needs review
FileSize
project_dependency.try_harder_deleting_branches.1992752_02.patch1 KB

I think this would probably do it. D6 patch.

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
FileSize
project_dependency.deleting_branches_1992752_03.patch2.44 KB

I tested this version on qa6-drupal.redesign.devdrupal.org and think it will probably work out.

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
FileSize
project_dependency.deleting_branches_1992752_04.patch2.44 KB

I think we should do this one. SHould be the same thing.

rcross’s picture

rcross CreditAttribution: rcross commented

@Randy - can you confirm you intended for #3 and #4 to be the same patch? diff shows no difference.

rcross’s picture

rcross CreditAttribution: rcross commented
FileSize
project_dependency.deleting_branches_1992752_05.patch3.28 KB

I've rerolled this to eliminate the conditional fetching.

rcross’s picture

rcross CreditAttribution: rcross commented
FileSize
project_dependency.deleting_branches_1992752_06.patch3.29 KB

wrong format. try this one.

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
Status: Needs review » Reviewed & tested by the community

Looks OK to me, and let's run through the testing together.

My only question: Why leave the fetch in the else instead of making it unconditional? I know it makes logical sense, but should we just do it even after a clone, for simplicity of code?

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
Status: Reviewed & tested by the community » Fixed

Committed to
6.x-1.x: http://drupalcode.org/project/project_dependency.git/commitdiff/9c045f7
7.x-1.x: http://drupalcode.org/project/project_dependency.git/commitdiff/cc3cc44

Thanks and congrats @rcross

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented

Now this needs to be deployed; looks to me like jenkins/bender isn't really up to the task right now. But hope to get it this week.

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
Issue tags: +needs drupal.org deployment

needs drupal.org deployment

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
Status: Fixed » Reviewed & tested by the community

In all the mess of getting the testbots stabilized after infra changes I forgot all about this. Still needs deployment. I'm going to mark it rtbc...

rfay’s picture

rfay
Primary language English
Location Palisade, CO, USA
CreditAttribution: rfay commented
Status: Reviewed & tested by the community » Fixed

Deployed! Now what will happen?

Automatically closed -- issue fixed for 2 weeks with no activity.

drumm’s picture

drumm
he/him
Location NY, US
CreditAttribution: drumm commented
Issue summary: View changes
Issue tags: -needs drupal.org deployment