mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
350cde4c4b
We now try to sync all projects that can be done safely first, before we start rebasing user commits over the upstream. This has the nice effect of making the local tree as close to the upstream as possible before the user has to start resolving merge conflicts, as that extra information in other projects may aid in the conflict resolution. Informational output is buffered and delayed until calculation for all projects has been done, so that the user gets one concise list of notice messages, rather than it interrupting the progress meter. Fast-forward output is now prefixed with the project header, so the user can see which project that update is taking place in, and make some relation of the diffstat back to the project name. Rebase output is now prefixed with the project header, so that if the rebase fails, the user can see which project we were operating on and can try to address the failure themselves. Since rebase sits on a detached HEAD, we now look for an in-progress rebase during sync, so we can alert the user that the given project is in a state we cannot handle. Signed-off-by: Shawn O. Pearce <sop@google.com> |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| abandon.py | ||
| branches.py | ||
| checkout.py | ||
| diff.py | ||
| download.py | ||
| forall.py | ||
| grep.py | ||
| help.py | ||
| init.py | ||
| manifest.py | ||
| prune.py | ||
| selfupdate.py | ||
| stage.py | ||
| start.py | ||
| status.py | ||
| sync.py | ||
| upload.py | ||
| version.py | ||