Show More
@@ -326,7 +326,12 b' def reposetup(ui, repo):' | |||||
326 | if self.dirstate.normalize(lf).startswith(d): |
|
326 | if self.dirstate.normalize(lf).startswith(d): | |
327 | actualfiles.append(lf) |
|
327 | actualfiles.append(lf) | |
328 | if not matcheddir: |
|
328 | if not matcheddir: | |
329 | actualfiles.append(lfutil.standin(f)) |
|
329 | # There may still be normal files in the dir, so | |
|
330 | # make sure a directory is in the list, which | |||
|
331 | # forces status to walk and call the match | |||
|
332 | # function on the matcher. Windows does NOT | |||
|
333 | # require this. | |||
|
334 | actualfiles.append('.') | |||
330 | matcheddir = True |
|
335 | matcheddir = True | |
331 | # Nothing in dir, so readd it |
|
336 | # Nothing in dir, so readd it | |
332 | # and let commit reject it |
|
337 | # and let commit reject it |
@@ -351,5 +351,30 b' largefile and a normal file. Then a lar' | |||||
351 | R sub1/sub2/test.txt |
|
351 | R sub1/sub2/test.txt | |
352 | ? foo/bar/abc |
|
352 | ? foo/bar/abc | |
353 | ? sub1/sub2/untracked.txt |
|
353 | ? sub1/sub2/untracked.txt | |
|
354 | $ hg add sub1/sub2 | |||
|
355 | $ hg ci -Sqm 'forget testing' | |||
|
356 | ||||
|
357 | Test issue4330: commit a directory where only normal files have changed | |||
|
358 | $ touch foo/bar/large.dat | |||
|
359 | $ hg add --large foo/bar/large.dat | |||
|
360 | $ hg ci -m 'add foo/bar/large.dat' | |||
|
361 | $ touch a.txt | |||
|
362 | $ touch a.dat | |||
|
363 | $ hg add -v foo/bar/abc a.txt a.dat | |||
|
364 | adding a.dat as a largefile | |||
|
365 | adding a.txt | |||
|
366 | adding foo/bar/abc (glob) | |||
|
367 | $ hg ci -m 'dir commit with only normal file deltas' foo/bar | |||
|
368 | $ hg status | |||
|
369 | A a.dat | |||
|
370 | A a.txt | |||
|
371 | ||||
|
372 | Test a directory commit with a changed largefile and a changed normal file | |||
|
373 | $ echo changed > foo/bar/large.dat | |||
|
374 | $ echo changed > foo/bar/abc | |||
|
375 | $ hg ci -m 'dir commit with normal and lf file deltas' foo | |||
|
376 | $ hg status | |||
|
377 | A a.dat | |||
|
378 | A a.txt | |||
354 |
|
379 | |||
355 | $ cd .. |
|
380 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now