Mercurial > public > mercurial-scm > hg-stable

diff hgext/largefiles/lfcommands.py @ 21083:20b0c49c032c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: update should only create a .orig backup of a largefile once A .orig of a standin after the update do that a .orig of the actual largefile is created. The .orig standin was however never removed again and the largefile .orig was thus overwritten again and again. The fix: remove the standin .orig when it is used.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 18 Apr 2013 18:56:18 +0200
parents 5db105f216c3
children e095626e8676
line wrap: on
line diff
--- a/hgext/largefiles/lfcommands.py	Mon Apr 07 02:12:28 2014 +0200
+++ b/hgext/largefiles/lfcommands.py	Thu Apr 18 18:56:18 2013 +0200
@@ -447,6 +447,7 @@
                 if (os.path.exists(absstandin + '.orig') and
                     os.path.exists(abslfile)):
                     shutil.copyfile(abslfile, abslfile + '.orig')
+                    util.unlinkpath(absstandin + '.orig')
                 expecthash = lfutil.readstandin(repo, lfile)
                 if (expecthash != '' and
                     (not os.path.exists(abslfile) or