Mercurial > jhg

diff src/org/tmatesoft/hg/repo/HgRepository.java @ 468:3ca4ae7bdd38 v1.0.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean experimental marks and deprecation code. Update version number to release
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 11 Jul 2012 17:48:17 +0200
parents 909306e412e2
children 7bcfbc255f48
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgRepository.java	Fri Jun 22 17:39:31 2012 +0200
+++ b/src/org/tmatesoft/hg/repo/HgRepository.java	Wed Jul 11 17:48:17 2012 +0200
@@ -32,7 +32,6 @@
 import org.tmatesoft.hg.internal.ByteArrayChannel;
 import org.tmatesoft.hg.internal.ConfigFile;
 import org.tmatesoft.hg.internal.DataAccessProvider;
-import org.tmatesoft.hg.internal.Experimental;
 import org.tmatesoft.hg.internal.Filter;
 import org.tmatesoft.hg.internal.Internals;
 import org.tmatesoft.hg.internal.RevlogStream;
@@ -235,7 +234,6 @@
 		return branches;
 	}
 
-	@Experimental(reason="Perhaps, shall not cache instance, and provide loadMergeState as it may change often")
 	public HgMergeState getMergeState() {
 		if (mergeState == null) {
 			mergeState = new HgMergeState(this);