MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SVN: one-click merge: selected changes merge comment

Browse Source
This commit is contained in:
irengrig
2010-05-31 17:40:39 +04:00
parent 09483bbfac
commit d05ab627c2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java
+4 -4
View File
@@ -108,12 +108,12 @@ public class Merger implements IMerger {
}
private void appendComment() {
if (myCommitMessage.length() == 0) {
myCommitMessage.append("Merged from ").append(myBranchName);
}
final String nextComment = myLatestProcessed.getComment();
if (nextComment.trim().length() > 0) {
if (myCommitMessage.length() != 0) {
myCommitMessage.append('\n');
}
myCommitMessage.append(nextComment).append(" [merged from ").append(myBranchName).append(", revision ").append(myLatestProcessed.getNumber()).append("]");
myCommitMessage.append('\n').append(nextComment).append(" [from revision ").append(myLatestProcessed.getNumber()).append("]");
}
}