commit afec3ceac169280d39df39bd2d92d6eafd09172e
author Stephen Li <stephenli@google.com> Mon Feb 06 11:16:22 2017 -0800
committer Stephen Li <stephenli@google.com> Mon Feb 06 11:20:47 2017 -0800
tree aa0ee73271b360474d3f959b728dbee62066ef4f
parent e4d442c6d6f35d45414f4b595029555585b14040

Force merge strategy recursive.

Change-Id: I3a4f4dadfd5a6776db21f0a88d49cd5381cac2c1

src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
index e02ceb5..a067416 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
@@ -382,6 +382,7 @@
 
     MergeInput mergeInput = new MergeInput();
     mergeInput.source = sdsMergeInput.currentRevision;
+    mergeInput.strategy = "recursive";
 
     log.debug("Creating downstream merge for {}", sdsMergeInput.currentRevision);
     ChangeInput downstreamChangeInput = new ChangeInput();

src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java
index 9242082..5be92c4 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java
@@ -116,6 +116,7 @@
     assertThat("testds").isEqualTo(changeInput.branch);
     assertThat(changeTopic).isEqualTo(changeInput.topic);
     assertThat(changeInput.merge.source).isEqualTo(currentRevision);
+    assertThat(changeInput.merge.strategy).isEqualTo("recursive");
 
     String expectedSubject = changeSubject + " am: " + currentRevision.substring(0, 10);
     assertThat(expectedSubject).isEqualTo(changeInput.subject);