Review 11.5 Abandoned

75015[BUGFIX] Change default branch for git-review

Simon Schaufelberger CR 0 V 0 Easy +1 −1 updated 07/01/22, 22:37

Commit message

When switching from `master` to `main` as default branch, it was
forgotten to change the `defaultbranch` value in `.gitreview` as
well.

Review

  • Code review CR 0
  • Verified V 0

Issues 1

Files 1

Review log 2123

  1. Simon Schaufelberger uploaded patch set 1 07/01/22, 16:38

  2. Simon Schaufelberger updated the commit message in patch set 2 07/01/22, 16:41

  3. Simon Schaufelberger wrote 07/01/22, 16:42

    Removed reviewer Oliver Hader.
  4. core-ci voted on patch set 1 V +1 07/01/22, 16:49 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/28592

  5. core-ci voted on patch set 2 V +1 07/01/22, 16:49 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/28594

  6. Christian Kuhn commented on patch set 2 07/01/22, 19:06

    i guess the main idea was to keep 'main' as default branch in 10.x and 11.x, too, since we're always reviewing bottom-down. -> i'd rather keep the 'main' patch version and keep main in v11 and v10, too? isn't that the intention of 'defaultbranch' anyways?
  7. Simon Schaufelberger commented on patch set 2 07/01/22, 19:27

    Reply

    No, this is for backports. They should go by default to 11.5 branch and NOT to main.
  8. Christian Kuhn commented on patch set 2 07/01/22, 19:34

    why do we need defaultbranch at all, then?
  9. Christian Kuhn commented on patch set 2 07/01/22, 19:36

    you're now establishing: main has defaulbranch=main 11.5 has defaultbranch=11.5 10.4 has defaultbranch=10.4 why do we need that option at all when it's identical to the branch anyways? plus: this now adds another 'todo' whenever we branch. can't we then skip 'defaultbranch' altogether or keep it set to 'main' in all active branches?
  10. Simon Schaufelberger commented on patch set 2 07/01/22, 19:36

    Reply

    For those people who use the gerrit phpstorm plugin (like me), yes because this is the config file for it afaik. For a normal "git push" the pushurl is used.
  11. Simon Schaufelberger commented on patch set 2 07/01/22, 19:39

    Reply

  12. Christian Kuhn commented on patch set 2 07/01/22, 19:48

    Reply

    ok. so your use-case is: i have a backport in a local-branch that is now 11.5 and i still want the plugin to push to 11.5? is that really worth the effort? backports are typically handled by core-mergers anyways since we push to main first in 95% of cases? my issue is: when the patch is applied, we have yet another file to adapt when branching ... i'd love to avoid that if possible.
  13. Christian Kuhn commented on patch set 2 07/01/22, 19:49

    Reply Unresolved

    'that is now 11.5' -> 'that is NOT 11.5'
  14. Christian Kuhn commented on patch set 2 07/01/22, 19:50

    do you really need to branch-off when fiddling with backports locally? I never do that ...
  15. Simon Schaufelberger commented on patch set 2 07/01/22, 19:55

    Reply

    well, we could also drop that file completely if it's only me who uses gerrit plugin.
  16. Simon Schaufelberger commented on patch set 2 07/01/22, 19:56

    I don't know if this file is useful for other software or workflows.
  17. Oliver Klee voted on patch set 2 CR +1 07/01/22, 19:57

  18. Christian Kuhn commented on patch set 2 07/01/22, 20:01

    Reply

    yeah. if have the same feeling: i'd rather fully remove .gitreview since it seems to be of little use. we could then just drop that file in 'main' and keep v11 / v10 as is, and abandon here and in the v10 backport?
  19. Simon Schaufelberger commented on patch set 2 07/01/22, 20:02

    Reply

    no, i would drop it as backport as well.
  20. Christian Kuhn commented on patch set 2 07/01/22, 20:56

    Reply

    so we have a new patch for main-only to drop .gitreview in main, v11, v10 and then drop this backport patch plus the v10 backport patch?
  21. Christian Kuhn commented on patch set 2 07/01/22, 21:02

    Reply

    sorry, misphrased, better phrasing: We create a new patch to drop .gitreview in main, v11, v10 and then drop this backport patch plus the v10 backport version of this one?
  22. Simon Schaufelberger commented on patch set 2 07/01/22, 22:37

    Reply

    simply phrased: get rid of this file in every typo3 version ;)
  23. Simon Schaufelberger abandoned the change 07/01/22, 22:37

    file will be dropped