Mercurial > hg4j
comparison src/org/tmatesoft/hg/repo/HgBookmarks.java @ 613:f41dd9a3b8af v1.1m4
Remove few Experimental annotations as the API they've marked graduates
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 10 May 2013 17:31:27 +0200 |
parents | 5c68567b3645 |
children | 507602cb4fb3 |
comparison
equal
deleted
inserted
replaced
612:dca70c0b1f74 | 613:f41dd9a3b8af |
---|---|
28 import java.util.Map; | 28 import java.util.Map; |
29 | 29 |
30 import org.tmatesoft.hg.core.HgIOException; | 30 import org.tmatesoft.hg.core.HgIOException; |
31 import org.tmatesoft.hg.core.HgRepositoryLockException; | 31 import org.tmatesoft.hg.core.HgRepositoryLockException; |
32 import org.tmatesoft.hg.core.Nodeid; | 32 import org.tmatesoft.hg.core.Nodeid; |
33 import org.tmatesoft.hg.internal.Experimental; | |
34 import org.tmatesoft.hg.internal.FileChangeMonitor; | 33 import org.tmatesoft.hg.internal.FileChangeMonitor; |
35 import org.tmatesoft.hg.internal.Internals; | 34 import org.tmatesoft.hg.internal.Internals; |
36 import org.tmatesoft.hg.internal.LineReader; | 35 import org.tmatesoft.hg.internal.LineReader; |
37 import org.tmatesoft.hg.util.LogFacility; | 36 import org.tmatesoft.hg.util.LogFacility; |
38 | 37 |
160 * @param p2 second parent, or <code>null</code> | 159 * @param p2 second parent, or <code>null</code> |
161 * @param child new commit, descendant of one of the parents, not <code>null</code> | 160 * @param child new commit, descendant of one of the parents, not <code>null</code> |
162 * @throws HgIOException if failed to write updated bookmark information | 161 * @throws HgIOException if failed to write updated bookmark information |
163 * @throws HgRepositoryLockException if failed to lock repository for modifications | 162 * @throws HgRepositoryLockException if failed to lock repository for modifications |
164 */ | 163 */ |
165 @Experimental(reason="Provisional API") | |
166 public void updateActive(Nodeid p1, Nodeid p2, Nodeid child) throws HgIOException, HgRepositoryLockException { | 164 public void updateActive(Nodeid p1, Nodeid p2, Nodeid child) throws HgIOException, HgRepositoryLockException { |
167 if (activeBookmark == null) { | 165 if (activeBookmark == null) { |
168 return; | 166 return; |
169 } | 167 } |
170 Nodeid activeRev = getRevision(activeBookmark); | 168 Nodeid activeRev = getRevision(activeBookmark); |