| | |
|---|
| | | // patchset already merged
|
|---|
| | | Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);
|
|---|
| | | mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));
|
|---|
| | | return mergePanel;
|
|---|
| | | } else if (MergeStatus.MISSING_INTEGRATION_BRANCH == mergeStatus) {
|
|---|
| | | // target/integration branch is missing
|
|---|
| | | Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);
|
|---|
| | | mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));
|
|---|
| | | mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.missingIntegrationBranchMore"), ticket.mergeTo)));
|
|---|
| | | return mergePanel;
|
|---|
| | | } else {
|
|---|
| | | // patchset can not be cleanly merged
|
|---|
