Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgBookmarks.java @ 624:507602cb4fb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
623:fedc54356091 624:507602cb4fb3
165 if (activeBookmark == null) { 165 if (activeBookmark == null) {
166 return; 166 return;
167 } 167 }
168 Nodeid activeRev = getRevision(activeBookmark); 168 Nodeid activeRev = getRevision(activeBookmark);
169 if (!activeRev.equals(p1) && !activeRev.equals(p2)) { 169 if (!activeRev.equals(p1) && !activeRev.equals(p2)) {
170 // from the wiki: 170 return; // TestCommit#testNoBookmarkUpdate
171 // "active bookmarks are automatically updated when committing to the changeset they are pointing to"
172 // FIXME: test ci 1, hg bookmark active, ci 2, hg bookmark -f -r 0 active, ci 3, check active still points to r0
173 return;
174 } 171 }
175 if (child.equals(activeRev)) { 172 if (child.equals(activeRev)) {
176 return; 173 return;
177 } 174 }
178 LinkedHashMap<String, Nodeid> copy = new LinkedHashMap<String, Nodeid>(bookmarks); 175 LinkedHashMap<String, Nodeid> copy = new LinkedHashMap<String, Nodeid>(bookmarks);