Details

    • Type: Task
    • Status: Unverified Fix
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 3.0.7-PL1
    • Fix Version/s: 3.0.9-RC1
    • Component/s: None
    • Labels:
      None

      Description

      Merging should be as easy as:

      merge-ticket.sh 1234 evil3 develop-olympus

      This should:

      • git remote update
      • git branch ticket/evil3/1234 evil3/ticket/1234
      • git checkout develop-olympus
      • git merge --no-ff evil3/ticket/1234

        Activity

        Hide
        igorw Igor Wiedler [X] (Inactive) added a comment -

        Optionally it should also:

        • git checkout develop
        • git merge --no-ff develop-olympus
        Show
        igorw Igor Wiedler [X] (Inactive) added a comment - Optionally it should also: git checkout develop git merge --no-ff develop-olympus
        Hide
        bantu Andreas Fischer added a comment -

        It should probably also optionally run the unit tests and revert the merge when tests fail.

        Show
        bantu Andreas Fischer added a comment - It should probably also optionally run the unit tests and revert the merge when tests fail.
        Hide
        igorw Igor Wiedler [X] (Inactive) added a comment -

        I'll keep it basic for now, it just performs the merge. Merging develop-olympus into develop can be done by hand.

        Andreas: To run the tests we need to check if phpunit is installed and then cd into the tests directory. Not sure how to do either of those, would be great if you could take a look at that.

        Show
        igorw Igor Wiedler [X] (Inactive) added a comment - I'll keep it basic for now, it just performs the merge. Merging develop-olympus into develop can be done by hand. Andreas: To run the tests we need to check if phpunit is installed and then cd into the tests directory. Not sure how to do either of those, would be great if you could take a look at that.
        Hide
        Oleg Oleg [X] (Inactive) added a comment -

        Patch url is 404.

        Show
        Oleg Oleg [X] (Inactive) added a comment - Patch url is 404.
        Hide
        igorw Igor Wiedler [X] (Inactive) added a comment -

        Ok, new script does this:

        you provide the pull request id

        it does some sanity checks

        if merge into develop:

        git checkout develop
        git pull upstream develop
        git merge --no-ff teh-feature
        phpunit

        if merge into develop-olympus:

        git checkout develop-olympus
        git pull upstream develop-olympus
        git merge --no-ff teh-feature
        phpunit
         
        git checkout develop
        git pull upstream develop
        git merge --no-ff develop-olympus
        phpunit

        Show
        igorw Igor Wiedler [X] (Inactive) added a comment - Ok, new script does this: you provide the pull request id it does some sanity checks if merge into develop: git checkout develop git pull upstream develop git merge --no-ff teh-feature phpunit if merge into develop-olympus: git checkout develop-olympus git pull upstream develop-olympus git merge --no-ff teh-feature phpunit   git checkout develop git pull upstream develop git merge --no-ff develop-olympus phpunit

          People

          • Assignee:
            igorw Igor Wiedler [X] (Inactive)
            Reporter:
            igorw Igor Wiedler [X] (Inactive)
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development