mercurial/localrepo.py
changeset 21478 3b647aed4394
parent 21475 c6976a4a39db
child 21479 e18ef2e11219
equal deleted inserted replaced
21477:466964bdf4c1 21478:3b647aed4394
  1554 
  1554 
  1555         if not parentworking:
  1555         if not parentworking:
  1556             r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
  1556             r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
  1557                                   listunknown)
  1557                                   listunknown)
  1558 
  1558 
       
  1559         r = ctx2._poststatus(ctx1, r, match, listignored, listclean,
       
  1560                              listunknown)
  1559         modified, added, removed, deleted, unknown, ignored, clean = r
  1561         modified, added, removed, deleted, unknown, ignored, clean = r
  1560 
       
  1561         if working:
       
  1562             modified = ctx2._filtersuspectsymlink(modified)
       
  1563 
  1562 
  1564         if reversed:
  1563         if reversed:
  1565             added, removed = removed, added
  1564             added, removed = removed, added
  1566 
  1565 
  1567         r = modified, added, removed, deleted, unknown, ignored, clean
  1566         r = modified, added, removed, deleted, unknown, ignored, clean