##// END OF EJS Templates
nodesbetween: fix a bug with duplicate heads
Benoit Boissinot -
r3360:ef830758 default
parent child Browse files
Show More
@@ -599,12 +599,12 b' class revlog(object):'
599 if not heads:
599 if not heads:
600 return nonodes
600 return nonodes
601 ancestors = {}
601 ancestors = {}
602 # Start at the top and keep marking parents until we're done.
603 nodestotag = heads[:]
604 # Turn heads into a dictionary so we can remove 'fake' heads.
602 # Turn heads into a dictionary so we can remove 'fake' heads.
605 # Also, later we will be using it to filter out the heads we can't
603 # Also, later we will be using it to filter out the heads we can't
606 # find from roots.
604 # find from roots.
607 heads = dict.fromkeys(heads, 0)
605 heads = dict.fromkeys(heads, 0)
606 # Start at the top and keep marking parents until we're done.
607 nodestotag = heads.keys()
608 # Remember where the top was so we can use it as a limit later.
608 # Remember where the top was so we can use it as a limit later.
609 highestrev = max([self.rev(n) for n in nodestotag])
609 highestrev = max([self.rev(n) for n in nodestotag])
610 while nodestotag:
610 while nodestotag:
@@ -72,6 +72,10 b' hg -R test bundle --base 2 -r tip test-b'
72 hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
72 hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
73 hg -R test bundle --base 2 test-bundle-all.hg
73 hg -R test bundle --base 2 test-bundle-all.hg
74 hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
74 hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
75
76 # issue76 msg2163
77 hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
78
75 hg clone test-2 test-9
79 hg clone test-2 test-9
76 cd test-9
80 cd test-9
77 echo % 2
81 echo % 2
General Comments 0
You need to be logged in to leave comments. Login now