My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3735: Submit whole topic doesn't work with Cherry Pick/Rebase strategy
1 person starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by org...@gmail.com, Dec 23, 2015
Affected Version: 2.12

What steps will reproduce the problem?
1. Configure change.submitWholeTopic = true
2. Configure the project to have "Cherry Pick" or "Rebase if Necessary" strategy
3. Create multiple commits that depend on each other (e.g. change the same line)
4. Push them with a topic
5. Approve them all, and try to submit

What is the expected output? What do you see instead?
They should all be submitted. Instead, gerrit complains about conflicts and doesn't allow to submit any of them.

I'd expect gerrit to use a merge commit for all the changes, regardless of the project strategy (maybe make that configurable), or at least "just work", and submit all the changes sequentially.
Sign in to add a comment

Powered by Google Project Hosting