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