Show More
@@ -1636,18 +1636,6 b' def overriderollback(orig, ui, repo, **o' | |||||
1636 | for standin in orphans: |
|
1636 | for standin in orphans: | |
1637 | repo.wvfs.unlinkpath(standin, ignoremissing=True) |
|
1637 | repo.wvfs.unlinkpath(standin, ignoremissing=True) | |
1638 |
|
1638 | |||
1639 | lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
|||
1640 | with lfdirstate.parentchange(): |
|
|||
1641 | orphans = set(lfdirstate) |
|
|||
1642 | lfiles = lfutil.listlfiles(repo) |
|
|||
1643 | for file in lfiles: |
|
|||
1644 | lfutil.synclfdirstate(repo, lfdirstate, file, True) |
|
|||
1645 | orphans.discard(file) |
|
|||
1646 | for lfile in orphans: |
|
|||
1647 | lfdirstate.update_file( |
|
|||
1648 | lfile, p1_tracked=False, wc_tracked=False |
|
|||
1649 | ) |
|
|||
1650 | lfdirstate.write() |
|
|||
1651 | return result |
|
1639 | return result | |
1652 |
|
1640 | |||
1653 |
|
1641 |
General Comments 0
You need to be logged in to leave comments.
Login now