##// END OF EJS Templates
lfs: fix committing deleted files caused by e0a1b9ee93cd...
Jun Wu -
r35468:488634db default
parent child Browse files
Show More
@@ -124,7 +124,7 b' def reposetup(ui, repo):'
124 if 'lfs' not in repo.requirements:
124 if 'lfs' not in repo.requirements:
125 ctx = repo[kwargs['node']]
125 ctx = repo[kwargs['node']]
126 # TODO: is there a way to just walk the files in the commit?
126 # TODO: is there a way to just walk the files in the commit?
127 if any(ctx[f].islfs() for f in ctx.files()):
127 if any(ctx[f].islfs() for f in ctx.files() if f in ctx):
128 repo.requirements.add('lfs')
128 repo.requirements.add('lfs')
129 repo._writerequirements()
129 repo._writerequirements()
130
130
@@ -680,3 +680,12 b' This convert is trickier, because it con'
680
680
681 $ hg -R convert_lfs2 config --debug extensions | grep lfs
681 $ hg -R convert_lfs2 config --debug extensions | grep lfs
682 $TESTTMP/convert_lfs2/.hg/hgrc:*: extensions.lfs= (glob)
682 $TESTTMP/convert_lfs2/.hg/hgrc:*: extensions.lfs= (glob)
683
684 Committing deleted files works:
685
686 $ hg init $TESTTMP/repo-del
687 $ cd $TESTTMP/repo-del
688 $ echo 1 > A
689 $ hg commit -m 'add A' -A A
690 $ hg rm A
691 $ hg commit -m 'rm A'
General Comments 0
You need to be logged in to leave comments. Login now