phetsims / perennial

Maintenance tools that won't change with different versions of chipper checked out
MIT License
2 stars 5 forks source link

MR process: Maintenance process should check to make sure branches are remotely tracked #255

Open jonathanolson opened 2 years ago

jonathanolson commented 2 years ago

It came up today with the following reported error:

Error: Failure updating dependencies for balloons-and-static-electricity to 1.5: Error: git pull in ../scenery failed with exit code 1
stderr:
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> balloons-and-static-electricity-1.5

    at Function.updateDependencies (C:\Users\Jesse\Documents\Development\phetsims\perennial\js\common\Maintenance.js:821:17)
    at processTicksAndRejections (node:internal/process/task_queues:96:5)
Full Error details:
{}

where the branch existed locally, but wasn't tracked to the remote. This failed out updateDependencies.

This required manually setting the upstream with git branch --set-upstream-to=origin/balloons-and-static-electricity-1.5 balloons-and-static-electricity-1.5 in scenery in this case.