##// END OF EJS Templates
bookmarks: Fix spelling and grammar
Joel Rosdahl -
r7251:444d8817 default
parent child Browse files
Show More
@@ -7,7 +7,7 b''
7 '''mercurial bookmarks
7 '''mercurial bookmarks
8
8
9 Mercurial bookmarks are local moveable pointers to changesets. Every bookmark
9 Mercurial bookmarks are local moveable pointers to changesets. Every bookmark
10 points to a changesets identified by it's hash. If you commit a changeset
10 points to a changeset identified by its hash. If you commit a changeset
11 that is based on a changeset that has a bookmark on it, the bookmark is forwarded
11 that is based on a changeset that has a bookmark on it, the bookmark is forwarded
12 to the new changeset.
12 to the new changeset.
13
13
@@ -60,7 +60,7 b' def write(repo, refs):'
60 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, move=None):
60 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, move=None):
61 '''mercurial bookmarks
61 '''mercurial bookmarks
62
62
63 Bookmarks are pointer to certain commits that move when commiting.
63 Bookmarks are pointers to certain commits that move when commiting.
64 Bookmarks are local. They can be renamed, copied and deleted.
64 Bookmarks are local. They can be renamed, copied and deleted.
65 It is possible to use bookmark names in 'hg merge' and 'hg update' to
65 It is possible to use bookmark names in 'hg merge' and 'hg update' to
66 update to a given bookmark.
66 update to a given bookmark.
@@ -76,7 +76,7 b' def bookmark(ui, repo, mark=None, rev=No'
76
76
77 if move:
77 if move:
78 if move not in marks:
78 if move not in marks:
79 raise util.Abort(_("a bookmark of this name doesnot exists"))
79 raise util.Abort(_("a bookmark of this name does not exist"))
80 if mark in marks and not force:
80 if mark in marks and not force:
81 raise util.Abort(_("a bookmark of the same name already exists"))
81 raise util.Abort(_("a bookmark of the same name already exists"))
82 marks[mark] = marks[move]
82 marks[mark] = marks[move]
@@ -88,7 +88,7 b' def bookmark(ui, repo, mark=None, rev=No'
88 if mark == None:
88 if mark == None:
89 raise util.Abort(_("bookmark name required"))
89 raise util.Abort(_("bookmark name required"))
90 if mark not in marks:
90 if mark not in marks:
91 raise util.Abort(_("a bookmark of this name does not exists"))
91 raise util.Abort(_("a bookmark of this name does not exist"))
92 del marks[mark]
92 del marks[mark]
93 write(repo, marks)
93 write(repo, marks)
94 return
94 return
General Comments 0
You need to be logged in to leave comments. Login now