Show More
@@ -17,6 +17,7 b' from .node import (' | |||||
17 | ) |
|
17 | ) | |
18 | from . import ( |
|
18 | from . import ( | |
19 | encoding, |
|
19 | encoding, | |
|
20 | error, | |||
20 | lock as lockmod, |
|
21 | lock as lockmod, | |
21 | obsolete, |
|
22 | obsolete, | |
22 | util, |
|
23 | util, | |
@@ -154,7 +155,10 b' class bmstore(dict):' | |||||
154 |
|
155 | |||
155 | def expandname(self, bname): |
|
156 | def expandname(self, bname): | |
156 | if bname == '.': |
|
157 | if bname == '.': | |
157 |
|
|
158 | if self.active: | |
|
159 | return self.active | |||
|
160 | else: | |||
|
161 | raise error.Abort(_("no active bookmark")) | |||
158 | return bname |
|
162 | return bname | |
159 |
|
163 | |||
160 | def _readactive(repo, marks): |
|
164 | def _readactive(repo, marks): |
@@ -113,6 +113,19 b' export the active bookmark' | |||||
113 | exporting bookmark V |
|
113 | exporting bookmark V | |
114 | [1] |
|
114 | [1] | |
115 |
|
115 | |||
|
116 | exporting the active bookmark with 'push -B .' | |||
|
117 | demand that one of the bookmarks is activated | |||
|
118 | ||||
|
119 | $ hg update -r default | |||
|
120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
121 | (leaving bookmark V) | |||
|
122 | $ hg push -B . ../a | |||
|
123 | abort: no active bookmark | |||
|
124 | [255] | |||
|
125 | $ hg update -r V | |||
|
126 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
127 | (activating bookmark V) | |||
|
128 | ||||
116 | delete the bookmark |
|
129 | delete the bookmark | |
117 |
|
130 | |||
118 | $ hg book -d V |
|
131 | $ hg book -d V |
General Comments 0
You need to be logged in to leave comments.
Login now