Show More
@@ -240,7 +240,7 b' class bmstore(object):' | |||||
240 | if self.active: |
|
240 | if self.active: | |
241 | return self.active |
|
241 | return self.active | |
242 | else: |
|
242 | else: | |
243 |
raise error. |
|
243 | raise error.RepoLookupError(_("no active bookmark")) | |
244 | return bname |
|
244 | return bname | |
245 |
|
245 | |||
246 | def checkconflict(self, mark, force=False, target=None): |
|
246 | def checkconflict(self, mark, force=False, target=None): |
@@ -345,7 +345,7 b' demand that one of the bookmarks is acti' | |||||
345 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
345 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
346 | (leaving bookmark V) |
|
346 | (leaving bookmark V) | |
347 | $ hg push -B . ../a |
|
347 | $ hg push -B . ../a | |
348 | abort: no active bookmark |
|
348 | abort: no active bookmark! | |
349 | [255] |
|
349 | [255] | |
350 | $ hg update -r V |
|
350 | $ hg update -r V | |
351 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
351 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -172,12 +172,9 b' but "literal:." is not since "." seems n' | |||||
172 |
|
172 | |||
173 | $ hg bookmark --inactive |
|
173 | $ hg bookmark --inactive | |
174 | $ hg log -r 'bookmark(.)' |
|
174 | $ hg log -r 'bookmark(.)' | |
175 | abort: no active bookmark |
|
175 | abort: no active bookmark! | |
176 | [255] |
|
176 | [255] | |
177 | BUG: this should be resolved to an empty set: |
|
|||
178 | $ hg log -r 'present(bookmark(.))' |
|
177 | $ hg log -r 'present(bookmark(.))' | |
179 | abort: no active bookmark |
|
|||
180 | [255] |
|
|||
181 |
|
178 | |||
182 | $ hg log -r 'bookmark(unknown)' |
|
179 | $ hg log -r 'bookmark(unknown)' | |
183 | abort: bookmark 'unknown' does not exist! |
|
180 | abort: bookmark 'unknown' does not exist! | |
@@ -263,7 +260,7 b' rename bookmark using . with no active b' | |||||
263 | $ hg book rename-me |
|
260 | $ hg book rename-me | |
264 | $ hg book -i rename-me |
|
261 | $ hg book -i rename-me | |
265 | $ hg book -m . renamed |
|
262 | $ hg book -m . renamed | |
266 | abort: no active bookmark |
|
263 | abort: no active bookmark! | |
267 | [255] |
|
264 | [255] | |
268 | $ hg up -q Y |
|
265 | $ hg up -q Y | |
269 | $ hg book -d rename-me |
|
266 | $ hg book -d rename-me | |
@@ -283,7 +280,7 b' delete bookmark using . with no active b' | |||||
283 | $ hg book delete-me |
|
280 | $ hg book delete-me | |
284 | $ hg book -i delete-me |
|
281 | $ hg book -i delete-me | |
285 | $ hg book -d . |
|
282 | $ hg book -d . | |
286 | abort: no active bookmark |
|
283 | abort: no active bookmark! | |
287 | [255] |
|
284 | [255] | |
288 | $ hg up -q Y |
|
285 | $ hg up -q Y | |
289 | $ hg book -d delete-me |
|
286 | $ hg book -d delete-me |
General Comments 0
You need to be logged in to leave comments.
Login now