Show More
@@ -2804,7 +2804,7 b' class generatorset(abstractsmartset):' | |||||
2804 | pass |
|
2804 | pass | |
2805 | return self.first() |
|
2805 | return self.first() | |
2806 | if self: |
|
2806 | if self: | |
2807 | return it.next() |
|
2807 | return it().next() | |
2808 | return None |
|
2808 | return None | |
2809 |
|
2809 | |||
2810 | def last(self): |
|
2810 | def last(self): | |
@@ -2818,7 +2818,7 b' class generatorset(abstractsmartset):' | |||||
2818 | pass |
|
2818 | pass | |
2819 | return self.first() |
|
2819 | return self.first() | |
2820 | if self: |
|
2820 | if self: | |
2821 | return it.next() |
|
2821 | return it().next() | |
2822 | return None |
|
2822 | return None | |
2823 |
|
2823 | |||
2824 | def spanset(repo, start=None, end=None): |
|
2824 | def spanset(repo, start=None, end=None): |
@@ -28,3 +28,9 b' Bogus fast-forward should fail:' | |||||
28 | abort: merging with a working directory ancestor has no effect |
|
28 | abort: merging with a working directory ancestor has no effect | |
29 | [255] |
|
29 | [255] | |
30 |
|
30 | |||
|
31 | Even with strange revset (issue4465) | |||
|
32 | ||||
|
33 | $ hg merge ::. | |||
|
34 | abort: merging with a working directory ancestor has no effect | |||
|
35 | [255] | |||
|
36 |
General Comments 0
You need to be logged in to leave comments.
Login now