Skip to content
Snippets Groups Projects
Commit 1b449b01 authored by Danek Duvall's avatar Danek Duvall
Browse files

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.
parent 7316a284
No related branches found
No related tags found
No related merge requests found
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
Archive wdir() with subrepos Archive wdir() with subrepos
$ hg rm main $ hg rm main
$ hg archive -S -r 'wdir()' ../wdir $ hg archive -S -r 'wdir()' ../wdir
$ diff -r . ../wdir | grep -v '\.hg$' $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
Only in ../wdir: .hg_archival.txt Only in ../wdir: .hg_archival.txt
$ find ../wdir -type f | sort $ find ../wdir -type f | sort
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
$ hg add sub1/sub2 $ hg add sub1/sub2
$ hg archive -S -r 'wdir()' ../wdir2 $ hg archive -S -r 'wdir()' ../wdir2
$ diff -r . ../wdir2 | grep -v '\.hg$' $ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:'
Only in ../wdir2: .hg_archival.txt Only in ../wdir2: .hg_archival.txt
Only in .: .hglf Only in .: .hglf
Only in .: foo Only in .: foo
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
$ echo 'mod' > large.bin $ echo 'mod' > large.bin
$ echo 'mod' > sub1/sub2/large.dat $ echo 'mod' > sub1/sub2/large.dat
$ hg archive -S -r 'wdir()' ../wdir3 $ hg archive -S -r 'wdir()' ../wdir3
$ diff -r . ../wdir3 | grep -v '\.hg$' $ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories'
Only in ../wdir3: .hg_archival.txt Only in ../wdir3: .hg_archival.txt
Only in .: .hglf Only in .: .hglf
Only in .: foo Only in .: foo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment