##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-merge1: avoid a shell script
Alexis S. L. Carvalho -
r4294:ccfe423d default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,10 +1,10 b''
1 1 #!/bin/sh
2 2
3 cat <<'EOF' > merge
4 #!/bin/sh
5 echo merging for `basename $1`
3 cat <<EOF > merge
4 import sys, os
5 print "merging for", os.path.basename(sys.argv[1])
6 6 EOF
7 chmod +x merge
7 HGMERGE="python ../merge"; export HGMERGE
8 8
9 9 mkdir t
10 10 cd t
@@ -22,7 +22,7 b' hg add c'
22 22 hg commit -m "commit #2" -d "1000000 0"
23 23 echo This is file b1 > b
24 24 echo %% no merges expected
25 env HGMERGE=../merge hg merge 1
25 hg merge 1
26 26 hg diff --nodates
27 27 hg status
28 28 cd ..; rm -r t
@@ -43,9 +43,9 b' hg add c'
43 43 hg commit -m "commit #2" -d "1000000 0"
44 44 echo This is file b2 > b
45 45 echo %% merge should fail
46 env HGMERGE=../merge hg merge 1
46 hg merge 1
47 47 echo %% merge of b expected
48 env HGMERGE=../merge hg merge -f 1
48 hg merge -f 1
49 49 hg diff --nodates
50 50 hg status
51 51 cd ..; rm -r t
@@ -72,9 +72,9 b' cat b'
72 72
73 73 echo This is file b22 > b
74 74 echo %% merge fails
75 env HGMERGE=../merge hg merge 2
75 hg merge 2
76 76 echo %% merge expected!
77 env HGMERGE=../merge hg merge -f 2
77 hg merge -f 2
78 78 hg diff --nodates
79 79 hg status
80 80 cd ..; rm -r t
@@ -96,8 +96,8 b' hg add c'
96 96 hg commit -m "commit #3" -d "1000000 0"
97 97 echo This is file b33 > b
98 98 echo %% merge of b should fail
99 env HGMERGE=../merge hg merge 2
99 hg merge 2
100 100 echo %% merge of b expected
101 env HGMERGE=../merge hg merge -f 2
101 hg merge -f 2
102 102 hg diff --nodates
103 103 hg status
General Comments 0
You need to be logged in to leave comments. Login now