Show More
@@ -1892,9 +1892,9 b' class memctx(committablectx):' | |||||
1892 | p2node = nullid |
|
1892 | p2node = nullid | |
1893 | p = pctx[f].parents() # if file isn't in pctx, check p2? |
|
1893 | p = pctx[f].parents() # if file isn't in pctx, check p2? | |
1894 | if len(p) > 0: |
|
1894 | if len(p) > 0: | |
1895 | p1node = p[0].node() |
|
1895 | p1node = p[0].filenode() | |
1896 | if len(p) > 1: |
|
1896 | if len(p) > 1: | |
1897 | p2node = p[1].node() |
|
1897 | p2node = p[1].filenode() | |
1898 | man[f] = revlog.hash(self[f].data(), p1node, p2node) |
|
1898 | man[f] = revlog.hash(self[f].data(), p1node, p2node) | |
1899 |
|
1899 | |||
1900 | for f in self._status.added: |
|
1900 | for f in self._status.added: |
General Comments 0
You need to be logged in to leave comments.
Login now