1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
/**
* @copyright
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
* @endcopyright
*/
package org.apache.subversion.javahl;
/**
* The result returned by the callback API used to handle conflicts
* encountered during merge/update/switch operations. Includes a poor
* man's enum for <code>svn_wc_conflict_choice_t</code>.
*/
public class ConflictResult
{
/**
* A value corresponding to the
* <code>svn_wc_conflict_choice_t</code> enum.
*/
private Choice choice;
/**
* The path to the result of a merge, or <code>null</code>.
*/
private String mergedPath;
/**
* Create a new conflict result instance.
*/
public ConflictResult(Choice choice, String mergedPath)
{
this.choice = choice;
this.mergedPath = mergedPath;
}
/**
* @return A value corresponding to the
* <code>svn_wc_conflict_choice_t</code> enum.
*/
public Choice getChoice()
{
return choice;
}
/**
* @return The path to the result of a merge, or <code>null</code>.
*/
public String getMergedPath()
{
return mergedPath;
}
public enum Choice
{
/** Nothing done to resolve the conflict; conflict remains. */
postpone,
/** Resolve the conflict by choosing the base file. */
chooseBase,
/**
* Resolve the conflict by choosing the incoming (repository)
* version of the object.
*/
chooseTheirsFull,
/**
* Resolve the conflict by choosing own (local) version of the
* object.
*/
chooseMineFull,
/**
* Resolve the conflict by choosing the incoming (repository)
* version of the object (for conflicted hunks only).
*/
chooseTheirsConflict,
/**
* Resolve the conflict by choosing own (local) version of the
* object (for conflicted hunks only).
*/
chooseMineConflict,
/**
* Resolve the conflict by choosing the merged object
* (potentially manually edited).
*/
chooseMerged;
}
}
|
