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

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
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/tmatesoft/hg/internal/MergeStateBuilder.java	Thu Aug 15 18:43:50 2013 +0200
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013 TMate Software Ltd
+ *  
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * For information on how to redistribute this software under
+ * the terms of a license other than GNU General Public License
+ * contact TMate Software at support@hg4j.com
+ */
+package org.tmatesoft.hg.internal;
+
+import org.tmatesoft.hg.core.HgIOException;
+import org.tmatesoft.hg.repo.HgMergeState;
+import org.tmatesoft.hg.util.Path;
+
+/**
+ * Constructs merge/state file
+ * 
+ * @see HgMergeState
+ * @author Artem Tikhomirov
+ * @author TMate Software Ltd.
+ */
+public class MergeStateBuilder {
+	
+	private final Internals repo;
+
+	public MergeStateBuilder(Internals implRepo) {
+		repo = implRepo;
+	}
+	
+	public void resolved() {
+		throw Internals.notImplemented();
+	}
+
+	public void unresolved(Path file) {
+		throw Internals.notImplemented();
+	}
+
+	public void serialize(Transaction tr) throws HgIOException {
+	}
+}