Mercurial > hg > mercurial

annotate mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/exception/NothingToMergeException.java @ 1124:a14a2f7e74d8 development/2024.03.x tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2024.03.x branch is created
author Nadia Burnasheva <nadezhda.burnasheva@jetbrains.com>
date Thu, 15 Feb 2024 11:33:35 +0100
parents 7bf4d943d5bb
children
rev   line source
751
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
1 /*
976
7bf4d943d5bb Update copyright
pavel.sher
parents: 751
diff changeset
2 * Copyright 2000-2018 JetBrains s.r.o.
751
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
3 *
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
4 * Licensed under the Apache License, Version 2.0 (the "License");
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
5 * you may not use this file except in compliance with the License.
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
6 * You may obtain a copy of the License at
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
7 *
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
8 * http://www.apache.org/licenses/LICENSE-2.0
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
9 *
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
10 * Unless required by applicable law or agreed to in writing, software
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
11 * distributed under the License is distributed on an "AS IS" BASIS,
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
13 * See the License for the specific language governing permissions and
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
14 * limitations under the License.
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
15 */
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
16
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
17 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command.exception;
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
18
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
19 import jetbrains.buildServer.vcs.VcsException;
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
20
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
21 public class NothingToMergeException extends VcsException {
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
22
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
23 public NothingToMergeException() {
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
24 super("Nothing to merge");
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
25 }
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
26
3dc67825ce0d Emulate fast-forward merge when dstBranch is reachable from srcRevision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
27 }