Show More
@@ -1830,7 +1830,8 b' def mergeupdate(orig, repo, node, branch' | |||
|
1830 | 1830 | raise error.ProgrammingError( |
|
1831 | 1831 | b'largefiles is not compatible with in-memory merge' |
|
1832 | 1832 | ) |
|
1833 |
with |
|
|
1833 | with repo.dirstate.changing_parents(repo): | |
|
1834 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | |
|
1834 | 1835 | result = orig(repo, node, branchmerge, force, *args, **kwargs) |
|
1835 | 1836 | |
|
1836 | 1837 | newstandins = lfutil.getstandinsstate(repo) |
@@ -1840,7 +1841,6 b' def mergeupdate(orig, repo, node, branch' | |||
|
1840 | 1841 | # all the ones that didn't change as clean |
|
1841 | 1842 | for lfile in oldclean.difference(filelist): |
|
1842 | 1843 | lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) |
|
1843 | lfdirstate.write(repo.currenttransaction()) | |
|
1844 | 1844 | |
|
1845 | 1845 | if branchmerge or force or partial: |
|
1846 | 1846 | filelist.extend(s.deleted + s.removed) |
General Comments 0
You need to be logged in to leave comments.
Login now