##// END OF EJS Templates
context.status: wipe deleted/unknown/ignored fields when reversed...
Martin von Zweigbergk -
r23301:c10dc556 default
parent child Browse files
Show More
@@ -304,9 +304,12 b' class basectx(object):'
304 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
304 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
305 listunknown)
305 listunknown)
306
306
307 r = scmutil.status(*r)
307 if reversed:
308 if reversed:
308 # reverse added and removed
309 # Reverse added and removed. Clear deleted, unknown and ignored as
309 r[1], r[2] = r[2], r[1]
310 # these make no sense to reverse.
311 r = scmutil.status(r.modified, r.removed, r.added, [], [], [],
312 r.clean)
310
313
311 if listsubrepos:
314 if listsubrepos:
312 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
315 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
@@ -325,8 +328,7 b' class basectx(object):'
325 for l in r:
328 for l in r:
326 l.sort()
329 l.sort()
327
330
328 # we return a tuple to signify that this list isn't changing
331 return r
329 return scmutil.status(*r)
330
332
331
333
332 def makememctx(repo, parents, text, user, date, branch, files, store,
334 def makememctx(repo, parents, text, user, date, branch, files, store,
General Comments 0
You need to be logged in to leave comments. Login now