equal
deleted
inserted
replaced
570 for file in dropped: |
570 for file in dropped: |
571 dirstate.drop(file) |
571 dirstate.drop(file) |
572 |
572 |
573 for file in lookup: |
573 for file in lookup: |
574 # File exists on disk, and we're bringing it back in an unknown state. |
574 # File exists on disk, and we're bringing it back in an unknown state. |
575 dirstate.normallookup(file) |
575 dirstate.update_file( |
|
576 file, p1_tracked=True, wc_tracked=True, possibly_dirty=True |
|
577 ) |
576 |
578 |
577 return added, dropped, lookup |
579 return added, dropped, lookup |
578 |
580 |
579 |
581 |
580 def aftercommit(repo, node): |
582 def aftercommit(repo, node): |