Affected Version:
Environment:
What steps will reproduce the problem?
1. having a tree with one change up to date.
2. repo sync
Repo notice that my tree is behind:
"""error: src/overlays/: branch disk_lib is published (but not merged) and is
now 42 commits behind"""
Check that there are no changes to upload:
(cr) (disk_lib) gwendal@gwendal ~/trunk/src/overlays $ repo upload --br
disk_lib --verify
no branches ready for upload
3. do a git pull to get the commits:
(cr) (disk_lib) gwendal@gwendal ~/trunk/src/overlays $ git pull --rebase
First, rewinding head to replay your work on top of it...
Applying: Populate rootdev device.
4. Check the rebase did not change any of my code.
5. try to upload the change again:
(cr) (disk_lib) gwendal@gwendal ~/trunk/src/overlays $ repo upload --br
disk_lib --verify
Upload project src/overlays/ to remote branch refs/heads/master:
branch disk_lib ( 1 commit, Wed Mar 26 16:40:21 2014 -0700):
4683a495 Populate rootdev device.
to https://chromium-review.googlesource.com (y/N)? n
error: upload aborted by user
What is the expected output? What do you see instead?
If I allow 'repo upload', it will add a change with gerrit with no real changes
in it. I would have expect repo to find out there was not changes to upload.
What am I doing wrong? Should I use a different command than 'git pull
--rebase' to get the new commits?
Please provide any additional information below.
Original issue reported on code.google.com by gwen...@chromium.org on 27 Mar 2014 at 12:13
Original issue reported on code.google.com by
gwen...@chromium.orgon 27 Mar 2014 at 12:13