Description Markus Duft 2011-12-22 07:42:31 EST

Build Identifier: 20110916-0149

When i have a conflict during merge or cherry-pick, i resolve the conflict and then press commit. Two problems are here now:

 1) the existing gerrit change-id of the original commit i'm cherry-picking is reset to all zeroes
 2) the gerrit change-id is in the wrong place. gerrit expects it to be the last thing in the message, but it isn't, because the "Conflicts: <files...>" paragraph follows it.

Reproducible: Always

Steps to Reproduce:
1. create two branches from master.
2. commit a little on both, producing a conflict (gerrit change id enabled for each commit)
3. cherry-pick one conflicting commit to the other branch
4. press commit