equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
2 |
2 |
3 mkdir -p t |
3 mkdir -p t |
4 cd t |
4 cd t |
5 |
5 |
6 cat <<'EOF' > merge |
6 cat <<EOF > merge |
7 #!/bin/sh |
7 import sys, os |
8 echo merge $1 $2 $3 > $1 |
8 f = open(sys.argv[1], "wb") |
|
9 f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3])) |
|
10 f.close() |
9 EOF |
11 EOF |
10 chmod +x merge |
12 HGMERGE="python ../merge"; export HGMERGE |
11 |
13 |
12 # perform a test merge with possible renaming |
14 # perform a test merge with possible renaming |
13 # |
15 # |
14 # args: |
16 # args: |
15 # $1 = action in local branch |
17 # $1 = action in local branch |
47 |
49 |
48 # merge |
50 # merge |
49 echo "--------------" |
51 echo "--------------" |
50 echo "test L:$1 R:$2 W:$3 - $4" |
52 echo "test L:$1 R:$2 W:$3 - $4" |
51 echo "--------------" |
53 echo "--------------" |
52 env HGMERGE=../merge hg merge -y --debug --traceback |
54 hg merge -y --debug --traceback |
53 |
55 |
54 echo "--------------" |
56 echo "--------------" |
55 hg status -camC -X rev |
57 hg status -camC -X rev |
56 |
58 |
57 hg ci -m "merge" -d "0 0" |
59 hg ci -m "merge" -d "0 0" |