commit c5d7bfd972009307d07c1f6f71ff655126393af7
author Stefan Beller <sbeller@google.com> Wed Mar 18 12:30:29 2015 -0700
committer Stefan Beller <sbeller@google.com> Thu Apr 30 16:06:13 2015 -0700
tree e9b106d6fb8652d7648a312f921c8eb13702d58c
parent 79d17aa007135e0284419ac5ed4e76749eeb32ca

CherryPick: Append new branch to topic for cherry-picked change

When cherry picking a change to another branch gerrit used to preserve
the topic of the original change. This may lead to confusion if
`change.submitWholeTopic` is enabled as then the newly cherry-picked
change is part of a set of changes which is supposed to be submitted
together.

This seems to be unnecessary as cherry picking usually involves moving
important changes such as bug fixes to another branch which is not
supposed to be part of the same set to be submitted at the same time.

Change-Id: I195774b7f594553018e13101a6b3ce904249eed6

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index 79460fd..09e6ffe 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -174,7 +174,7 @@
     assertThat(cherryIt.next().message).isEqualTo(expectedMessage);
 
     assertThat(cherry.get().subject).contains(in.message);
-    assertThat(cherry.get().topic).isEqualTo("someTopic");
+    assertThat(cherry.get().topic).isEqualTo("someTopic-foo");
     cherry.current().review(ReviewInput.approve());
     cherry.current().submit();
   }

gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java
index b386894..540f5d0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java
@@ -184,7 +184,7 @@
         // change.
         Change newChange = createNewChange(git, revWalk, changeKey, project,
             destRef, cherryPickCommit, refControl,
-            identifiedUser, change.getTopic());
+            identifiedUser, change.getTopic() + "-" + newDest.getShortName());
 
         addMessageToSourceChange(change, patch.getId(), destinationBranch,
             cherryPickCommit, identifiedUser, refControl);