3
3
* ====================================================================
4
* Copyright (c) 2007-2008 CollabNet. All rights reserved.
6
* This software is licensed as described in the file COPYING, which
7
* you should have received as part of this distribution. The terms
8
* are also available at http://subversion.tigris.org/license-1.html.
9
* If newer versions of this license are posted there, you may use a
10
* newer version instead, at your option.
12
* This software consists of voluntary contributions made by many
13
* individuals. For exact contribution history, see the revision
14
* history and logs, available at http://subversion.tigris.org/.
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
15
20
* ====================================================================
111
116
this.srcRightVersion = srcRight;
119
public ConflictDescriptor(org.apache.subversion.javahl.ConflictDescriptor
122
this(aDesc.getPath(), aDesc.getKind().ordinal(),
123
NodeKind.fromApache(aDesc.getNodeKind()),
124
aDesc.getPropertyName(), aDesc.isBinary(), aDesc.getMIMEType(),
125
aDesc.getAction().ordinal(), aDesc.getReason().ordinal(),
126
aDesc.getOperation().ordinal(), aDesc.getBasePath(),
127
aDesc.getTheirPath(), aDesc.getMyPath(), aDesc.getMergedPath(),
128
new ConflictVersion(aDesc.getSrcLeftVersion()),
129
new ConflictVersion(aDesc.getSrcRightVersion()));
114
132
public String getPath()