##// END OF EJS Templates
Fix test-push-validation under Windows
Patrick Mezard -
r10469:b26c4a89 stable
parent child Browse files
Show More
@@ -9,6 +9,7 b''
9 import sys, os
9 import sys, os
10
10
11 input = sys.stdin.read()
11 input = sys.stdin.read()
12 input = input.replace(os.environ['HGTMP'], '$HGTMP')
13 input = input.replace(os.sep, '/')
12 input = input.replace(os.sep, '/')
13 hgtmp = os.environ['HGTMP'].replace(os.sep, '/')
14 input = input.replace(hgtmp, '$HGTMP')
14 sys.stdout.write(input)
15 sys.stdout.write(input)
@@ -1,7 +1,5 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 STRIP=`pwd`
4
5 hg init test
3 hg init test
6 cd test
4 cd test
7 cat > .hg/hgrc <<EOF
5 cat > .hg/hgrc <<EOF
@@ -21,4 +19,4 b' cp .hg/store/data/beta.i tmp'
21 echo blah >> beta
19 echo blah >> beta
22 hg ci -m '2 (corrupt)'
20 hg ci -m '2 (corrupt)'
23 mv tmp .hg/store/data/beta.i
21 mv tmp .hg/store/data/beta.i
24 hg push 2>&1 | sed "s%$STRIP%test-root%"
22 hg push 2>&1 | "$TESTDIR/filtertmp.py"
@@ -2,7 +2,7 b' adding alpha'
2 adding beta
2 adding beta
3 updating to branch default
3 updating to branch default
4 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 pushing to test-root/test
5 pushing to $HGTMP/test-push-validation/test
6 searching for changes
6 searching for changes
7 adding changesets
7 adding changesets
8 adding manifests
8 adding manifests
General Comments 0
You need to be logged in to leave comments. Login now