##// END OF EJS Templates
committablefilectx: propagate ancestry info to parent to fix annotation...
Yuya Nishihara -
r24817:0bb98eee stable
parent child Browse files
Show More
@@ -1618,7 +1618,7 b' class committablefilectx(basefilectx):'
1618 for pc in pcl[1:]:
1618 for pc in pcl[1:]:
1619 pl.append((path, filenode(pc, path), fl))
1619 pl.append((path, filenode(pc, path), fl))
1620
1620
1621 return [filectx(self._repo, p, fileid=n, filelog=l)
1621 return [self._parentfilectx(p, fileid=n, filelog=l)
1622 for p, n, l in pl if n != nullid]
1622 for p, n, l in pl if n != nullid]
1623
1623
1624 def children(self):
1624 def children(self):
@@ -556,6 +556,7 b' create history with a filerev whose link'
556 grafting 1:fd27c222e3e6 "contentB"
556 grafting 1:fd27c222e3e6 "contentB"
557 $ echo C >> a
557 $ echo C >> a
558 $ hg commit -m 'contentC'
558 $ hg commit -m 'contentC'
559 $ echo W >> a
559 $ hg log -G
560 $ hg log -G
560 @ changeset: 4:072f1e8df249
561 @ changeset: 4:072f1e8df249
561 | tag: tip
562 | tag: tip
@@ -592,6 +593,12 b' Annotate should list ancestor of startin'
592 3: B
593 3: B
593 4: C
594 4: C
594
595
596 $ hg annotate a -r 'wdir()'
597 0 : A
598 3 : B
599 4 : C
600 4+: W
601
595 Even when the starting revision is the linkrev-shadowed one:
602 Even when the starting revision is the linkrev-shadowed one:
596
603
597 $ hg annotate a -r 3
604 $ hg annotate a -r 3
General Comments 0
You need to be logged in to leave comments. Login now