##// END OF EJS Templates
large-files: use `running_status` in `mergeupdate`
marmoute -
r51036:42288fa0 default
parent child Browse files
Show More
@@ -1786,15 +1786,15 b' def mergeupdate(orig, repo, node, branch'
1786 #
1786 #
1787 # (*) don't care
1787 # (*) don't care
1788 # (*1) deprecated, but used internally (e.g: "rebase --collapse")
1788 # (*1) deprecated, but used internally (e.g: "rebase --collapse")
1789
1789 with repo.dirstate.running_status(repo):
1790 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
1790 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
1791 unsure, s, mtime_boundary = lfdirstate.status(
1791 unsure, s, mtime_boundary = lfdirstate.status(
1792 matchmod.always(),
1792 matchmod.always(),
1793 subrepos=[],
1793 subrepos=[],
1794 ignored=False,
1794 ignored=False,
1795 clean=True,
1795 clean=True,
1796 unknown=False,
1796 unknown=False,
1797 )
1797 )
1798 oldclean = set(s.clean)
1798 oldclean = set(s.clean)
1799 pctx = repo[b'.']
1799 pctx = repo[b'.']
1800 dctx = repo[node]
1800 dctx = repo[node]
General Comments 0
You need to be logged in to leave comments. Login now