Show More
@@ -246,7 +246,7 b' def _lfconvert_addchangeset(rsrc, rdst, ' | |||||
246 | def getfilectx(repo, memctx, f): |
|
246 | def getfilectx(repo, memctx, f): | |
247 | if lfutil.isstandin(f): |
|
247 | if lfutil.isstandin(f): | |
248 | # if the file isn't in the manifest then it was removed |
|
248 | # if the file isn't in the manifest then it was removed | |
249 |
# or renamed, r |
|
249 | # or renamed, return None to indicate this | |
250 | srcfname = lfutil.splitstandin(f) |
|
250 | srcfname = lfutil.splitstandin(f) | |
251 | try: |
|
251 | try: | |
252 | fctx = ctx.filectx(srcfname) |
|
252 | fctx = ctx.filectx(srcfname) |
@@ -1864,8 +1864,8 b' class memctx(committablectx):' | |||||
1864 | commit function for every file in 'files', but calls order is |
|
1864 | commit function for every file in 'files', but calls order is | |
1865 | undefined. If the file is available in the revision being |
|
1865 | undefined. If the file is available in the revision being | |
1866 | committed (updated or added), filectxfn returns a memfilectx |
|
1866 | committed (updated or added), filectxfn returns a memfilectx | |
1867 |
object. If the file was removed, filectxfn r |
|
1867 | object. If the file was removed, filectxfn return None for recent | |
1868 |
|
|
1868 | Mercurial. Moved files are represented by marking the source file | |
1869 | removed and the new file added with copy information (see |
|
1869 | removed and the new file added with copy information (see | |
1870 | memfilectx). |
|
1870 | memfilectx). | |
1871 |
|
1871 |
General Comments 0
You need to be logged in to leave comments.
Login now