Show More
@@ -2891,6 +2891,11 b' class memctx(committablectx):' | |||||
2891 |
|
2891 | |||
2892 | return scmutil.status(modified, added, removed, [], [], [], []) |
|
2892 | return scmutil.status(modified, added, removed, [], [], [], []) | |
2893 |
|
2893 | |||
|
2894 | def parents(self): | |||
|
2895 | if self._parents[1].node() == nullid: | |||
|
2896 | return [self._parents[0]] | |||
|
2897 | return self._parents | |||
|
2898 | ||||
2894 |
|
2899 | |||
2895 | class memfilectx(committablefilectx): |
|
2900 | class memfilectx(committablefilectx): | |
2896 | """memfilectx represents an in-memory file to commit. |
|
2901 | """memfilectx represents an in-memory file to commit. |
General Comments 0
You need to be logged in to leave comments.
Login now