rebase a change in 2.11

[Martin Waitz]

In Gerrit 2.11, the rebase button is always shown and opens a dialog.
When clicking on "change parent revision", I can enter "a subject, change number or leave empty".

One stupid question:
What is supposed to happen when I leave the target revision empty?
Is this documented somewhere?

When I try it, I just get the error message "The change could not be rebased due to a conflict during merge."
(Even for a change which rebased correctly when not enabling the "change parent revision")

-- Martin

[David Pursehouse]

On 04/15/2015 05:23 PM, Martin Waitz wrote:
> In Gerrit 2.11, the rebase button is always shown and opens a dialog.
> When clicking on "change parent revision", I can enter "a subject,
> change number or leave empty".
>
> One stupid question:
> What is supposed to happen when I leave the target revision empty?
> Is this documented somewhere?
>

In the case where you have changes like this:

Change 3
Change 2
Change 1
HEAD of master

and press the rebase button on Change 3, leaving the target revision
empty will rebase the change onto the HEAD.

> When I try it, I just get the error message "The change could not be
> rebased due to a conflict during merge."
> (Even for a change which rebased correctly when not enabling the "change
> parent revision")
>
> -- Martin
>

> --
> --
> To unsubscribe, email repo-discuss...@googlegroups.com
> More info at http://groups.google.com/group/repo-discuss?hl=en
>
> ---
> You received this message because you are subscribed to the Google
> Groups "Repo and Gerrit Discussion" group.
> To unsubscribe from this group and stop receiving emails from it, send
> an email to repo-discuss...@googlegroups.com
> <mailto:repo-discuss...@googlegroups.com>.
> For more options, visit https://groups.google.com/d/optout.

[Martin Waitz]

Am Mittwoch, 15. April 2015 10:28:50 UTC+2 schrieb David Pursehouse:

In the case where you have changes like this:

Change 3
Change 2
Change 1
HEAD of master

and press the rebase button on Change 3, leaving the target revision
empty will rebase the change onto the HEAD.

 
That makes sense but is not obvious...

Maybe we can simplify the user interface a bit:
 * remove the 'change parent revision' checkbox
 * pre-fill the revision selection with the current parent change (empty if there is none)

Enable the 'rebase' button if the selected parent is different from the current one.
If the user did not change the parent field then it would be enabled when
there is a new patchset in the parent change or a new commit on the target branch.

Removing the dependency is then done by literally removing it from the text field.

-- Martin

[Martin Waitz]

Am Mittwoch, 15. April 2015 10:48:16 UTC+2 schrieb Martin Waitz:

 * pre-fill the revision selection with the current parent change (empty if there is none)

Of course I meant: empty if the parent change is already merged.

[David Pursehouse]

Sounds good, but it's unlikely to get done in time to be included in the
final 2.11 release.

[Martin Waitz]

https://code.google.com/p/gerrit/issues/detail?id=3297