equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
2 |
2 |
3 # This test makes sure that we don't mark a file as merged with its ancestor |
3 # This test makes sure that we don't mark a file as merged with its ancestor |
4 # when we do a merge. |
4 # when we do a merge. |
5 |
5 |
6 cat <<'EOF' > merge |
6 cat <<EOF > merge |
7 #!/bin/sh |
7 import sys, os |
8 echo merging for `basename $1` |
8 print "merging for", os.path.basename(sys.argv[1]) |
9 EOF |
9 EOF |
10 chmod +x merge |
10 HGMERGE="python ../merge"; export HGMERGE |
11 |
11 |
12 echo creating base |
12 echo creating base |
13 hg init a |
13 hg init a |
14 cd a |
14 cd a |
15 echo 1 > foo |
15 echo 1 > foo |
39 echo "we shouldn't have anything but n state here" |
39 echo "we shouldn't have anything but n state here" |
40 hg debugstate | cut -b 1-16,35- |
40 hg debugstate | cut -b 1-16,35- |
41 |
41 |
42 echo merging |
42 echo merging |
43 hg pull ../a |
43 hg pull ../a |
44 env HGMERGE=../merge hg merge -v |
44 hg merge -v |
45 |
45 |
46 echo 2m > foo |
46 echo 2m > foo |
47 echo 2b > baz |
47 echo 2b > baz |
48 echo new > quux |
48 echo new > quux |
49 |
49 |