Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgBookmarks.java @ 624:507602cb4fb3
FIXMEs and TODOs: pay some technical debt
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Mon, 20 May 2013 20:34:33 +0200 |
parents | f41dd9a3b8af |
children | 6526d8adbc0f |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgBookmarks.java Mon May 20 18:35:13 2013 +0200 +++ b/src/org/tmatesoft/hg/repo/HgBookmarks.java Mon May 20 20:34:33 2013 +0200 @@ -167,10 +167,7 @@ } Nodeid activeRev = getRevision(activeBookmark); if (!activeRev.equals(p1) && !activeRev.equals(p2)) { - // from the wiki: - // "active bookmarks are automatically updated when committing to the changeset they are pointing to" - // FIXME: test ci 1, hg bookmark active, ci 2, hg bookmark -f -r 0 active, ci 3, check active still points to r0 - return; + return; // TestCommit#testNoBookmarkUpdate } if (child.equals(activeRev)) { return;