Mercurial > hg
comparison tests/test-subrepo-deep-nested-change.t @ 25863:1b449b012073 stable
tests: diff -r on Solaris emits "Common subdirectories:"
When using the -r option to Solaris diff, any directores that compare
identically are mentioned in the output. We don't really care about these
directories for the purposes of this test, so ignore them.
author | Danek Duvall <danek.duvall@oracle.com> |
---|---|
date | Mon, 20 Jul 2015 15:42:39 -0700 |
parents | 18bae5eb58c5 |
children | a48a7c2d1fea |
comparison
equal
deleted
inserted
replaced
25862:7316a2847c63 | 25863:1b449b012073 |
---|---|
170 R sub1/sub2/test.txt | 170 R sub1/sub2/test.txt |
171 | 171 |
172 Archive wdir() with subrepos | 172 Archive wdir() with subrepos |
173 $ hg rm main | 173 $ hg rm main |
174 $ hg archive -S -r 'wdir()' ../wdir | 174 $ hg archive -S -r 'wdir()' ../wdir |
175 $ diff -r . ../wdir | grep -v '\.hg$' | 175 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' |
176 Only in ../wdir: .hg_archival.txt | 176 Only in ../wdir: .hg_archival.txt |
177 | 177 |
178 $ find ../wdir -type f | sort | 178 $ find ../wdir -type f | sort |
179 ../wdir/.hg_archival.txt | 179 ../wdir/.hg_archival.txt |
180 ../wdir/.hgsub | 180 ../wdir/.hgsub |
522 ? sub1/sub2/untracked.txt | 522 ? sub1/sub2/untracked.txt |
523 ? sub1/sub2/x.txt | 523 ? sub1/sub2/x.txt |
524 $ hg add sub1/sub2 | 524 $ hg add sub1/sub2 |
525 | 525 |
526 $ hg archive -S -r 'wdir()' ../wdir2 | 526 $ hg archive -S -r 'wdir()' ../wdir2 |
527 $ diff -r . ../wdir2 | grep -v '\.hg$' | 527 $ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:' |
528 Only in ../wdir2: .hg_archival.txt | 528 Only in ../wdir2: .hg_archival.txt |
529 Only in .: .hglf | 529 Only in .: .hglf |
530 Only in .: foo | 530 Only in .: foo |
531 Only in ./sub1/sub2: large.bin | 531 Only in ./sub1/sub2: large.bin |
532 Only in ./sub1/sub2: test.txt | 532 Only in ./sub1/sub2: test.txt |
561 Test 'wdir()' modified file archiving with largefiles | 561 Test 'wdir()' modified file archiving with largefiles |
562 $ echo 'mod' > main | 562 $ echo 'mod' > main |
563 $ echo 'mod' > large.bin | 563 $ echo 'mod' > large.bin |
564 $ echo 'mod' > sub1/sub2/large.dat | 564 $ echo 'mod' > sub1/sub2/large.dat |
565 $ hg archive -S -r 'wdir()' ../wdir3 | 565 $ hg archive -S -r 'wdir()' ../wdir3 |
566 $ diff -r . ../wdir3 | grep -v '\.hg$' | 566 $ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories' |
567 Only in ../wdir3: .hg_archival.txt | 567 Only in ../wdir3: .hg_archival.txt |
568 Only in .: .hglf | 568 Only in .: .hglf |
569 Only in .: foo | 569 Only in .: foo |
570 Only in ./sub1/sub2: large.bin | 570 Only in ./sub1/sub2: large.bin |
571 Only in ./sub1/sub2: test.txt | 571 Only in ./sub1/sub2: test.txt |