--- a/mercurial/HGCommandParserTests.st	Wed Mar 19 23:19:22 2014 +0000
+++ b/mercurial/HGCommandParserTests.st	Fri Mar 21 11:23:30 2014 +0000
@@ -48,6 +48,60 @@
 "
 ! !
 
+!HGCommandParserTests methodsFor:'tests - bookmarks'!
+
+test_bookmarks_01
+
+    | bookmarks |
+
+    bookmarks := (HGCommandParser on: '   issue17-better-log-support 403:5cc256ed28a1
+   issue33-http-auth         377:b2123fd2888b
+   issue37-update-to-revision 399:858944cebec4
+ * master                    403:5cc256ed28a1
+') parseBookmarks.
+
+    self assert: bookmarks size == 4.
+    self assert: bookmarks first class == HGBookmark.
+    self assert: bookmarks first name = 'issue17-better-log-support'.
+    self assert: bookmarks first changesetId revno = 403.
+    self assert: bookmarks first changesetId hexPrintString = '5CC256ED28A1'.
+
+    self assert: bookmarks fourth class == HGBookmark.
+    self assert: bookmarks fourth name = 'master'.
+    self assert: bookmarks fourth changesetId revno = 403.
+    self assert: bookmarks fourth changesetId hexPrintString = '5CC256ED28A1'.
+
+    "Created: / 19-03-2014 / 23:40:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-03-2014 / 17:12:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_dot_hg_bookmarks_01
+
+    | bookmarks |
+
+    bookmarks := (HGCommandParser on: '5cc256ed28a11cd07117f9ee98f5aeb296e96cea issue17-better-log-support
+5cc256ed28a11cd07117f9ee98f5aeb296e96cea master
+858944cebec4a9ca6825aaaa3838513e35fe604f issue37-update-to-revision X X
+b2123fd2888bb4077501d7d276639a463753d02e issue33-http-auth
+') parseDotHgBookmarks.
+
+    self assert: bookmarks size == 4.
+    self assert: bookmarks first class == HGBookmark.
+    self assert: bookmarks first name = 'issue17-better-log-support'.
+    self assert: bookmarks first changesetId hexPrintString = '5CC256ED28A11CD07117F9EE98F5AEB296E96CEA'.
+
+    self assert: bookmarks third class == HGBookmark.
+    self assert: bookmarks third name = 'issue37-update-to-revision X X'.
+
+
+    self assert: bookmarks fourth class == HGBookmark.
+    self assert: bookmarks fourth name = 'issue33-http-auth'.
+    self assert: bookmarks fourth changesetId hexPrintString = 'B2123FD2888BB4077501D7D276639A463753D02E'.
+
+    "Created: / 20-03-2014 / 02:07:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-03-2014 / 18:54:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !HGCommandParserTests methodsFor:'tests - commands'!
 
 test_cmd_branches_01
@@ -651,7 +705,6 @@
 
     rev := (HGCommandParser on: '4:6f88e1f44d9eb86e0b56ca15e30e5d786acd83c7
 default
-bookmark1 fixes
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2 -1:0000000000000000000000000000000000000000 
 
 
@@ -668,12 +721,9 @@
     self assert: rev author = 'Jan Vrany <jan.vrany@fit.cvut.cz>'.
     self assert: rev timestamp hour = 13.
     self assert: rev message = 'Commit 4'.
-    self assert: rev bookmarks size == 2.
-    self assert: (rev bookmarks includes: 'bookmark1').
-    self assert: (rev bookmarks includes: 'fixes')
 
     "Created: / 05-12-2012 / 17:37:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-02-2014 / 12:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 23:25:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_misc_03b
@@ -682,7 +732,6 @@
 
     rev := (HGCommandParser on: '4:6f88e1f44d9eb86e0b56ca15e30e5d786acd83c7
 default
-
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2 -1:0000000000000000000000000000000000000000 
 
 
@@ -700,7 +749,7 @@
 Two lones'.
 
     "Created: / 21-11-2012 / 18:09:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-02-2014 / 11:59:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 23:25:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_misc_03c
@@ -709,7 +758,6 @@
 
     rev := (HGCommandParser on: '4:6f88e1f44d9eb86e0b56ca15e30e5d786acd83c7
 default
-
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2 -1:0000000000000000000000000000000000000000 
 
 
@@ -727,7 +775,7 @@
 Two lones'.
 
     "Created: / 05-12-2012 / 17:39:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-02-2014 / 11:59:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 23:25:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_misc_04
@@ -736,7 +784,6 @@
 
     revs := (HGCommandParser on: '4:6f88e1f44d9eb86e0b56ca15e30e5d786acd83c7
 default
-
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2 -1:0000000000000000000000000000000000000000 
 
 
@@ -749,7 +796,6 @@
 **EOE**
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2
 default
-
 2:db43a5baa9acaf2536d8b12c070b4f5e0363d45c -1:0000000000000000000000000000000000000000 
 
 
@@ -765,7 +811,7 @@
     self assert: revs size == 2
 
     "Created: / 13-11-2012 / 17:31:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-02-2014 / 12:01:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 23:32:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_misc_05a
@@ -774,7 +820,6 @@
 
     rev := (HGCommandParser on: '4:6f88e1f44d9eb86e0b56ca15e30e5d786acd83c7
 default
-
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2 -1:0000000000000000000000000000000000000000 
 
 b/f2.txt b/f3.txt f1.txt
@@ -790,7 +835,7 @@
     self assert: rev changes size == 4.
 
     "Created: / 05-12-2012 / 18:34:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-02-2014 / 11:59:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 23:25:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_misc_05b
@@ -799,7 +844,6 @@
 
     rev := (HGCommandParser on: '4:6f88e1f44d9eb86e0b56ca15e30e5d786acd83c7
 default
-
 3:912a64597e4f133ffbc1fdabdda99167a2d69ce2 -1:0000000000000000000000000000000000000000 
 
 c/f3.txt
@@ -815,7 +859,7 @@
     self assert: rev changes size == 1.
 
     "Created: / 05-12-2012 / 18:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-02-2014 / 11:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-03-2014 / 23:25:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_misc_06