tests: make test-convert-git.t reproducible
For reasons I can't explain, Git's copy detection code was identifying
different source files on OS X and (presumably) Solaris versus Linux
(which the test was originally authored against). This was causing
unstable test output.
Changing the test to use a non-ambiguous source file appears to make
the test stable.
The test was introduced recently in
ea3540e66fd8.
--- a/tests/test-convert-git.t Thu Dec 22 11:22:32 2016 -0800
+++ b/tests/test-convert-git.t Sat Dec 24 10:40:08 2016 -0700
@@ -377,27 +377,38 @@
renamelimit config option works
$ cd git-repo2
- $ cp bar bar-copy0
- $ echo 0 >> bar-copy0
- $ cp bar bar-copy1
- $ echo 1 >> bar-copy1
- $ git add bar-copy0 bar-copy1
- $ commit -a -m 'copy bar 2 times'
+ $ cat >> copy-source << EOF
+ > sc0
+ > sc1
+ > sc2
+ > sc3
+ > sc4
+ > sc5
+ > sc6
+ > EOF
+ $ git add copy-source
+ $ commit -m 'add copy-source'
+ $ cp copy-source source-copy0
+ $ echo 0 >> source-copy0
+ $ cp copy-source source-copy1
+ $ echo 1 >> source-copy1
+ $ git add source-copy0 source-copy1
+ $ commit -a -m 'copy copy-source 2 times'
$ cd ..
$ hg -q convert --config convert.git.renamelimit=1 \
> --config convert.git.findcopiesharder=true --datesort git-repo2 fullrepo2
$ hg -R fullrepo2 status -C --change master
- A bar-copy0
- A bar-copy1
+ A source-copy0
+ A source-copy1
$ hg -q convert --config convert.git.renamelimit=100 \
> --config convert.git.findcopiesharder=true --datesort git-repo2 fullrepo3
$ hg -R fullrepo3 status -C --change master
- A bar-copy0
- bar
- A bar-copy1
- bar
+ A source-copy0
+ copy-source
+ A source-copy1
+ copy-source
test binary conversion (issue1359)