3
* ====================================================================
4
* Licensed to the Apache Software Foundation (ASF) under one
5
* or more contributor license agreements. See the NOTICE file
6
* distributed with this work for additional information
7
* regarding copyright ownership. The ASF licenses this file
8
* to you under the Apache License, Version 2.0 (the
9
* "License"); you may not use this file except in compliance
10
* with the License. You may obtain a copy of the License at
12
* http://www.apache.org/licenses/LICENSE-2.0
14
* Unless required by applicable law or agreed to in writing,
15
* software distributed under the License is distributed on an
16
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17
* KIND, either express or implied. See the License for the
18
* specific language governing permissions and limitations
20
* ====================================================================
24
package org.apache.subversion.javahl;
27
* The result returned by the callback API used to handle conflicts
28
* encountered during merge/update/switch operations. Includes a poor
29
* man's enum for <code>svn_wc_conflict_choice_t</code>.
31
public class ConflictResult
34
* A value corresponding to the
35
* <code>svn_wc_conflict_choice_t</code> enum.
37
private Choice choice;
40
* The path to the result of a merge, or <code>null</code>.
42
private String mergedPath;
45
* Create a new conflict result instace.
47
public ConflictResult(Choice choice, String mergedPath)
50
this.mergedPath = mergedPath;
54
* @return A value corresponding to the
55
* <code>svn_wc_conflict_choice_t</code> enum.
57
public Choice getChoice()
63
* @return The path to the result of a merge, or <code>null</code>.
65
public String getMergedPath()
72
/** Nothing done to resolve the conflict; conflict remains. */
75
/** Resolve the conflict by choosing the base file. */
79
* Resolve the conflict by choosing the incoming (repository)
80
* version of the object.
85
* Resolve the conflict by choosing own (local) version of the
91
* Resolve the conflict by choosing the incoming (repository)
92
* version of the object (for conflicted hunks only).
97
* Resolve the conflict by choosing own (local) version of the
98
* object (for conflicted hunks only).
103
* Resolve the conflict by choosing the merged object
104
* (potentially manually edited).