Skip to content

forcibly create target branch in --update-pr#1728

Merged
boegel merged 1 commit intoeasybuilders:developfrom
boegel:update_pr_force_branch
Apr 20, 2016
Merged

forcibly create target branch in --update-pr#1728
boegel merged 1 commit intoeasybuilders:developfrom
boegel:update_pr_force_branch

Conversation

@boegel
Copy link
Copy Markdown
Member

@boegel boegel commented Apr 20, 2016

Target branch for PR may already exist, especially when --git-working-dirs-path is also used.

See for example fail in the tests:

======================================================================
ERROR [33.282s]: test_new_update_pr (test.framework.options.CommandLineOptionsTest)
Test use of --new-pr (dry run only).
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/data/jenkins/workspace/easybuild-framework_unit-test_hpcugent_develop-python27/test/framework/options.py", line 2322, in test_new_update_pr
    self.eb_main(args, do_build=True, raise_error=True, testing=False)
  File "/data/jenkins/workspace/easybuild-framework_unit-test_hpcugent_develop-python27/test/framework/utilities.py", line 270, in eb_main
    raise myerr
OSError: Reference at u'refs/heads/develop' does already exist, pointing to u'31a970811ede636eb58f7699c8bc1b76dfce8a4c', requested was 'f4c22aa9e199eb04cb36bb19347ccf2b8ef8e4f9'

----------------------------------------------------------------------

@boegel boegel added this to the v2.8.0 milestone Apr 20, 2016
@boegel
Copy link
Copy Markdown
Member Author

boegel commented Apr 20, 2016

@wpoely86 please review?

@hpcugentbot
Copy link
Copy Markdown

hpcugentbot commented Apr 20, 2016

EasyBuild framework unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-framework-pr-builder/2944/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@wpoely86
Copy link
Copy Markdown
Member

wpoely86 commented Apr 20, 2016

👍

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Apr 20, 2016

Thanks for the review @wpoely86!

@boegel boegel merged commit 07f6b22 into easybuilders:develop Apr 20, 2016
@boegel boegel deleted the update_pr_force_branch branch April 20, 2016 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.8.0

Development

Successfully merging this pull request may close these issues.

3 participants

@boegel @hpcugentbot @wpoely86