← Back to branch summary

~piastucki/bzr-eclipse/commit-dialog-margin-painter

« back to all changes in this revision

Viewing changes to org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/MergeCommand.java

  • Committer: Piotr Piastucki
  • Date: 2013-09-19 12:57:45 UTC
  • mfrom: (345.2.6 bzr-eclipse-pp)
  • Revision ID: piotr_piastucki-20130919125745-w7eqxwhd5ij8fggw
Merge lp:~piastucki/bzr-eclipse/pre-1.3.1-release-cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/MergeCommand.java
17
17
import org.vcs.bazaar.eclipse.CoreTexts;
18
18
import org.vcs.bazaar.eclipse.core.listeners.BzrChangeStateEvent;
19
19
import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
20
 
import org.vcs.bazaar.eclipse.core.utils.BzrStatus;
 
20
import org.vcs.bazaar.eclipse.core.utils.BzrTeamStatus;
21
21
import org.vcs.bazaar.eclipse.internal.core.BazaarException;
22
22
 
23
23
/**
49
49
            client.merge(location, options);
50
50
                } catch (BazaarClientException e) {
51
51
                        if (e.getMessage() != null && CONFLICT_PATTERN.matcher(e.getMessage()).find()) {
52
 
                                mergeConflictsException = new BazaarException(BzrStatus.INFO, IStatus.OK, CoreTexts.MergeConflicts_error, e);
 
52
                                mergeConflictsException = new BazaarException(BzrTeamStatus.INFO, IStatus.OK, CoreTexts.MergeConflicts_error, e);
53
53
                        } else {
54
54
                                throw BazaarException.wrapException(e);
55
55
                        }