Shawn Pearce 7d3ee8ef7b 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

2014-03-13 23:27:02 -07:00

..

.settings

Add .settings files for gerrit-acceptance-tests

2013-02-12 10:33:47 +00:00

src/test/java/com/google/gerrit/acceptance

Fix Merge Always and Merge If Necessary strategies

2014-03-13 23:27:02 -07:00

.gitignore

Ignore bin folder in acceptance-tests

2013-02-22 08:41:31 +01:00

BUCK

Add missing //gerrit-lucene:lucene dep to acceptance-tests

2013-11-06 12:56:59 -08:00

tests.defs

Fix acceptance test heap size to 128m

2013-07-30 10:27:14 -07:00