Submitter | phabricator |
---|---|
Date | Feb. 7, 2019, 2:03 a.m. |
Message ID | <be0d87da2ba0837301dd65fdb785f279@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/38504/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py --- a/hgext/largefiles/lfcommands.py +++ b/hgext/largefiles/lfcommands.py @@ -465,11 +465,11 @@ wctx = repo[None] for lfile in lfiles: lfileorig = os.path.relpath( - scmutil.origpath(ui, repo, wvfs.join(lfile)), + scmutil.backuppath(ui, repo, lfile), start=repo.root) standin = lfutil.standin(lfile) standinorig = os.path.relpath( - scmutil.origpath(ui, repo, wvfs.join(standin)), + scmutil.backuppath(ui, repo, standin), start=repo.root) if wvfs.exists(standin): if (wvfs.exists(standinorig) and