mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
Rename CVSNT "mergepoints" test and make it executable.
- rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output
This commit is contained in:
parent
53aca7b1bf
commit
bc8b9b1849
2
tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints → tests/test-convert-cvsnt-mergepoints
Normal file → Executable file
2
tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints → tests/test-convert-cvsnt-mergepoints
Normal file → Executable file
@ -73,7 +73,7 @@ cvscall -q up -P -jMYBRANCH1_2 | sed 's/RCS file: .*,v/merging MYBRANCH1_2/g'
|
||||
cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g'
|
||||
|
||||
REALCVS=`which cvs`
|
||||
echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > cvs
|
||||
echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > cvs
|
||||
chmod +x cvs
|
||||
PATH=.:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
|
||||
|
@ -52,6 +52,7 @@ Date:
|
||||
Author:
|
||||
Branch: HEAD
|
||||
Tag: (none)
|
||||
Branchpoints: MYBRANCH1_1, MYBRANCH1
|
||||
Log:
|
||||
foo.txt
|
||||
|
||||
@ -77,6 +78,7 @@ Date:
|
||||
Author:
|
||||
Branch: MYBRANCH1
|
||||
Tag: (none)
|
||||
Branchpoints: MYBRANCH1_2
|
||||
Parent: 2
|
||||
Log:
|
||||
baz
|
Loading…
Reference in New Issue
Block a user