My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 1412: Error message is unhelpful; should offer immediate command suggestion instead
8 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by k...@google.com, May 29, 2012
Affected Version:

Repo version 1.9.1

What steps will reproduce the problem?
1. "repo upload" a branch
2. Wait awhile for upstream commits to happen.
3. Do some more commits locally, perhaps amending.
4. Before submission, run "repo sync"

What is the actual output?

"error: vendor/.../: branch my_branch is published (but not merged) and is now 240 commits behind"

What is the expected output? What do you see instead?

Repo prints a friendly helpful message explaining that your branch needs to get rebased, and offers a command showing exactly how to do this; perhaps it even offers to run it immediately. For example:

"error: vendor/.../: branch my_branch is published (but not merged) and is now 240 commits behind. To upload to the same change ID, you must rebase against the remote branch; for example:

git rebase -i origin/correct_branch_here"

This would have saved me at least 30 minutes, maybe more, since I had to track down what the remote branch name is since repo semi-hides this.
Sign in to add a comment

Powered by Google Project Hosting