My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3414: Rebase change with 'Change parent revision' option is broken
2 people starred this issue and may be notified of changes. Back to list
Status:  Released
Owner:  ----
Closed:  Jun 2015
Cc:  david.pu...@sonymobile.com, dborowitz@google.com


Sign in to add a comment
 
Project Member Reported by David.Os...@gmail.com, Jun 7, 2015

Affected Version: 2.11-797-g7867c68

What steps will reproduce the problem?
1. Open this change https://gerrit-review.googlesource.com/68226
2. Click Rebase button on change screen
3. Popup dialog is opened
4. Activate Checkbox: "Change parent revision"
5. Leave input field empty, as suggested: "... leave it empty"
6. Click Rebase button on the popup dialog

What is the expected output?

It should be possible to rebase the change on top of master branch,
and get rid of the dependency on another change.

What do you see instead?

"500 Internal server error"


Jun 7, 2015
Project Member #1 david.pu...@sonymobile.com
I can reproduce as above, but I have not tried it on a local test server.

@dborowitz can you see a stack trace on the gerrit-review server for the above change?

Status: Accepted
Cc: dborowitz@google.com
Jun 8, 2015
#2 dborowitz@google.com
Yeah, this needs better error handling.

Error in POST /changes/X/revisions/Y/rebase
java.io.IOException: The change could not be rebased due to a conflict during merge.
	at com.google.gerrit.server.change.RebaseChange.rebase(RebaseChange.java:147)
	at com.google.gerrit.server.change.Rebase.apply(Rebase.java:92)
	at com.google.gerrit.server.change.Rebase.apply(Rebase.java:51)
	at com.google.gerrit.httpd.restapi.RestApiServlet.service(RestApiServlet.java:326)
Jun 8, 2015
Project Member #3 david.pu...@sonymobile.com
https://gerrit-review.googlesource.com/#/c/68541/
Status: ChangeUnderReview
Jun 9, 2015
Project Member #4 edwin.ke...@gmail.com
(No comment was entered for this change.)
Status: Submitted
Labels: FixedIn-2.12
Dec 21, 2015
Project Member #5 david.pu...@sonymobile.com
(No comment was entered for this change.)
Status: Released
Sign in to add a comment

Powered by Google Project Hosting