tree 6ea2ae9a29f2f122c7526d82fcac75cafba041bc
parent f79ac18f2015fbba1e1f5a3b17668a6081fc1783
author Sven Selberg <svense@axis.com> 1463039730 +0200
committer David Pursehouse <dpursehouse@collab.net> 1467769256 +0900

Fix %base option and "Create a new change for..." setting

Check if the pre-existing ref is a PatchSet of a change with a
different target branch than current push if
newChangeForAllNotInTarget == true or %base option is set and
create a new change for the new target.

Don't add the commits about to get merged to alreadyAccepted.

Else if a commit C is merged into branch A and you upload a new change
with the same commit to branch B, with the %base option or if
"Create a new change for every commit not in the target branch:" is
configured for the project, MergeOp will merge the commit into branch
B, but MergeUtil will not mark the status as "CLEAN_MERGE". The result
is that you get a "Change is new" error message, and in order to merge
the change you will need to upload a new PatchSet and merge that on top of
commit C.

Bug: Issue 3426
Change-Id: I01f4b9b04f1797d403671b27b8c2e61d1fd3bcc6