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