##// END OF EJS Templates
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)...
Pierre-Yves David -
r23705:28a302e9 default
parent child Browse files
Show More
@@ -877,10 +877,11 b' class basefilectx(object):'
877 return pl
877 return pl
878
878
879 # use linkrev to find the first changeset where self appeared
879 # use linkrev to find the first changeset where self appeared
880 if self.rev() != self.linkrev():
880 base = self
881 base = self.filectx(self.filenode())
881 introrev = self.introrev()
882 else:
882 if self.rev() != introrev:
883 base = self
883 base = filectx(self._repo, self._path, filelog=self.filelog(),
884 fileid=self.filenode(), changeid=introrev)
884
885
885 # This algorithm would prefer to be recursive, but Python is a
886 # This algorithm would prefer to be recursive, but Python is a
886 # bit recursion-hostile. Instead we do an iterative
887 # bit recursion-hostile. Instead we do an iterative
@@ -510,4 +510,10 b' Annotate should list ancestor of startin'
510 3: B
510 3: B
511 4: C
511 4: C
512
512
513 Even when the starting revision is the linkrev-shadowed one:
514
515 $ hg annotate a -r 3
516 0: A
517 3: B
518
513 $ cd ..
519 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now