Feature Request P3
Status Update
Comments
va...@chromium.org <va...@chromium.org> #2
[Empty comment from Monorail migration]
xx...@gmail.com <xx...@gmail.com> #3
[Comment Deleted]
ek...@google.com <ek...@google.com> #4
[Monorail components: Applications>repo]
ek...@google.com <ek...@google.com> #5
[Monorail components: -repo]
so...@google.com <so...@google.com> #6
[Empty comment from Monorail migration]
ap...@google.com <ap...@google.com> #8
Project: git-repo
Branch: main
commit c44ad093092f71320c6311cc1fc3de9171f6bd0c
Author: Jeroen Dhollander <jeroendh@google.com>
Date: Tue Aug 20 10:28:41 2024
Add a `--rebase` option to sync command
Previously repo would abort a sync if there were published changes not
merged upstream. The --rebase option allows the modification of
published commits.
This is a copy ofhttp://go/grev/369694 with the merge conflicts
resolved.
Bug: 40014610
Change-Id: Idac8199400346327b530abea33f1ed794e5bb4c2
Reviewed-on:https://gerrit-review.googlesource.com/c/git-repo/+/435838
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Tested-by: Jeroen Dhollander <jeroendh@google.com>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
M project.py
M subcmds/sync.py
https://gerrit-review.googlesource.com/435838
Branch: main
commit c44ad093092f71320c6311cc1fc3de9171f6bd0c
Author: Jeroen Dhollander <jeroendh@google.com>
Date: Tue Aug 20 10:28:41 2024
Add a `--rebase` option to sync command
Previously repo would abort a sync if there were published changes not
merged upstream. The --rebase option allows the modification of
published commits.
This is a copy of
resolved.
Bug: 40014610
Change-Id: Idac8199400346327b530abea33f1ed794e5bb4c2
Reviewed-on:
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Tested-by: Jeroen Dhollander <jeroendh@google.com>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
M project.py
M subcmds/sync.py
Description
2. This rebase behavior is changed (bypassed) if the local change is also published to Gerrit. And repo exits with failure error. An extra "repo rebase" or "git rebase" command is necessary to fix the error.
Please add a "--rebase" option to "repo sync" so that it always perform the rebase action no matter the local commit is published or not.
More details can be found at