Show More
@@ -392,7 +392,7 b' def _childrenspec(repo, subset, x, n, or' | |||||
392 | if len(c) > 1: |
|
392 | if len(c) > 1: | |
393 | raise error.RepoLookupError( |
|
393 | raise error.RepoLookupError( | |
394 | _("revision in set has more than one child")) |
|
394 | _("revision in set has more than one child")) | |
395 | r = c[0] |
|
395 | r = c[0].rev() | |
396 | else: |
|
396 | else: | |
397 | cs.add(r) |
|
397 | cs.add(r) | |
398 | return subset & cs |
|
398 | return subset & cs |
@@ -3131,9 +3131,11 b' parentrevspec' | |||||
3131 | $ log 'merge()^^^' |
|
3131 | $ log 'merge()^^^' | |
3132 | 1 |
|
3132 | 1 | |
3133 |
|
3133 | |||
3134 |
$ |
|
3134 | $ hg debugrevspec -s '(merge() | 0)~-1' | |
|
3135 | * set: | |||
|
3136 | <baseset+ [1, 7]> | |||
|
3137 | 1 | |||
3135 | 7 |
|
3138 | 7 | |
3136 | 1 |
|
|||
3137 | $ log 'merge()~-1' |
|
3139 | $ log 'merge()~-1' | |
3138 | 7 |
|
3140 | 7 | |
3139 | $ log 'tip~-1' |
|
3141 | $ log 'tip~-1' |
General Comments 0
You need to be logged in to leave comments.
Login now