Show More
@@ -186,7 +186,7 b' def rebase(ui, repo, **opts):' | |||||
186 | dest = scmutil.revsingle(repo, destf) |
|
186 | dest = scmutil.revsingle(repo, destf) | |
187 |
|
187 | |||
188 | if revf: |
|
188 | if revf: | |
189 |
rebaseset = repo |
|
189 | rebaseset = scmutil.revrange(repo, revf) | |
190 | elif srcf: |
|
190 | elif srcf: | |
191 | src = scmutil.revrange(repo, [srcf]) |
|
191 | src = scmutil.revrange(repo, [srcf]) | |
192 | rebaseset = repo.revs('(%ld)::', src) |
|
192 | rebaseset = repo.revs('(%ld)::', src) |
@@ -159,4 +159,18 b' rebase --continue with bookmarks present' | |||||
159 | o 0: 'A' bookmarks: |
|
159 | o 0: 'A' bookmarks: | |
160 |
|
160 | |||
161 |
|
161 | |||
162 | $ cd .. |
|
162 | ensure that bookmarks given the names of revset functions can be used | |
|
163 | as --rev arguments (issue3950) | |||
|
164 | ||||
|
165 | $ hg update -q 3 | |||
|
166 | $ echo bimble > bimble | |||
|
167 | $ hg add bimble | |||
|
168 | $ hg commit -q -m 'bisect' | |||
|
169 | $ echo e >> bimble | |||
|
170 | $ hg ci -m bisect2 | |||
|
171 | $ echo e >> bimble | |||
|
172 | $ hg ci -m bisect3 | |||
|
173 | $ hg book bisect | |||
|
174 | $ hg update -q Y | |||
|
175 | $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z | |||
|
176 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now