##// END OF EJS Templates
largefiles: don't actually remove largefiles in an addremove dry run...
Matt Harbison -
r23592:96d335e4 stable
parent child Browse files
Show More
@@ -189,8 +189,15 b' def removelargefiles(ui, repo, isaddremo'
189 189 # are removing the file.
190 190 if isaddremove:
191 191 ui.status(_('removing %s\n') % f)
192 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
193 lfdirstate.remove(f)
192
193 if not opts.get('dry_run'):
194 if not after:
195 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
196 lfdirstate.remove(f)
197
198 if opts.get('dry_run'):
199 return result
200
194 201 lfdirstate.write()
195 202 remove = [lfutil.standin(f) for f in remove]
196 203 # If this is being called by addremove, let the original addremove
@@ -250,6 +250,16 b' verify that large files in subrepos hand'
250 250 Add a normal file to the subrepo, then test archiving
251 251
252 252 $ echo 'normal file' > subrepo/normal.txt
253 $ mv subrepo/large.txt subrepo/renamed-large.txt
254 $ hg -R subrepo addremove --dry-run
255 removing large.txt
256 adding normal.txt
257 adding renamed-large.txt
258 $ hg status -S
259 ! subrepo/large.txt
260 ? subrepo/normal.txt
261 ? subrepo/renamed-large.txt
262 $ mv subrepo/renamed-large.txt subrepo/large.txt
253 263 $ hg -R subrepo add subrepo/normal.txt
254 264
255 265 Lock in subrepo, otherwise the change isn't archived
General Comments 0
You need to be logged in to leave comments. Login now