Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/MergeStateBuilder.java @ 705:b4242b7e7dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents
children 42b88709e41d
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
1 /*
2 * Copyright (c) 2013 TMate Software Ltd
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 2 of the License.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * For information on how to redistribute this software under
14 * the terms of a license other than GNU General Public License
15 * contact TMate Software at support@hg4j.com
16 */
17 package org.tmatesoft.hg.internal;
18
19 import org.tmatesoft.hg.core.HgIOException;
20 import org.tmatesoft.hg.repo.HgMergeState;
21 import org.tmatesoft.hg.util.Path;
22
23 /**
24 * Constructs merge/state file
25 *
26 * @see HgMergeState
27 * @author Artem Tikhomirov
28 * @author TMate Software Ltd.
29 */
30 public class MergeStateBuilder {
31
32 private final Internals repo;
33
34 public MergeStateBuilder(Internals implRepo) {
35 repo = implRepo;
36 }
37
38 public void resolved() {
39 throw Internals.notImplemented();
40 }
41
42 public void unresolved(Path file) {
43 throw Internals.notImplemented();
44 }
45
46 public void serialize(Transaction tr) throws HgIOException {
47 }
48 }