Show More
@@ -159,12 +159,11 b' class filectx(object):' | |||
|
159 | 159 | if filelog: |
|
160 | 160 | self._filelog = filelog |
|
161 | 161 | |
|
162 |
if |
|
|
163 | if changectx is None: | |
|
162 | if changeid is not None: | |
|
164 | 163 |
|
|
165 | else: | |
|
164 | if changectx is not None: | |
|
166 | 165 |
|
|
167 | else: | |
|
166 | if fileid is not None: | |
|
168 | 167 | self._fileid = fileid |
|
169 | 168 | |
|
170 | 169 | def __getattr__(self, name): |
@@ -175,6 +174,9 b' class filectx(object):' | |||
|
175 | 174 | self._filelog = self._repo.file(self._path) |
|
176 | 175 | return self._filelog |
|
177 | 176 | elif name == '_changeid': |
|
177 | if '_changectx' in self.__dict__: | |
|
178 | self._changeid = self._changectx.rev() | |
|
179 | else: | |
|
178 | 180 | self._changeid = self._filelog.linkrev(self._filenode) |
|
179 | 181 | return self._changeid |
|
180 | 182 | elif name == '_filenode': |
@@ -229,6 +231,8 b' class filectx(object):' | |||
|
229 | 231 | def rev(self): |
|
230 | 232 | if '_changectx' in self.__dict__: |
|
231 | 233 | return self._changectx.rev() |
|
234 | if '_changeid' in self.__dict__: | |
|
235 | return self._changectx.rev() | |
|
232 | 236 | return self._filelog.linkrev(self._filenode) |
|
233 | 237 | |
|
234 | 238 | def node(self): return self._changectx.node() |
@@ -45,7 +45,7 b' resolving manifests' | |||
|
45 | 45 | 1: remote moved to 1a -> m |
|
46 | 46 | copying 1 to 1a |
|
47 | 47 | merging 1 and 1a |
|
48 |
my 1@746e9549ea96+ other 1a@ |
|
|
48 | my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d | |
|
49 | 49 | removing 1 |
|
50 | 50 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
51 | 51 | (branch merge, don't forget to commit) |
General Comments 0
You need to be logged in to leave comments.
Login now