7d3ee8ef7b57826ad45efa49045ebd65dff358e5 - gerrit

commit	7d3ee8ef7b57826ad45efa49045ebd65dff358e5	[log] [tgz]
author	Shawn Pearce <sop@google.com>	Thu Mar 13 22:34:43 2014 -0700
committer	Shawn Pearce <sop@google.com>	Thu Mar 13 23:27:02 2014 -0700
tree	28dccd74b4e5b8c2400640eb163313783ead477a
parent	774f7e90be19f2b9f55f8ec9b1fe3609a5798ca4 [diff]

Fix Merge Always and Merge If Necessary strategies

Second and additional changes in the same submit attempt must be
built on the previously constructed merge, not the branch tip.

Include tests for these strategies and the same bug in Cherry Pick
that was fixed by cd60499cd65812d926806e49d15a6852c7798871.

Change-Id: I62524b39ee4104ab53b36c75b64c02b20b4d5e94

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java[diff]
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java[diff]
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeAlwaysIT.java[diff]
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeAlways.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeIfNecessary.java[diff]

6 files changed