##// END OF EJS Templates
run-tests.py: pass -L/--label to simplemerge...
Alexis S. L. Carvalho -
r4387:93a4e72b default
parent child Browse files
Show More
@@ -346,8 +346,9 b' DAEMON_PIDS = os.environ["DAEMON_PIDS"] '
346 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
346 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
347
347
348 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
348 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
349 os.environ["HGMERGE"] = 'python "%s"' % os.path.join(TESTDIR, os.path.pardir,
349 os.environ["HGMERGE"] = ('python "%s" -L my -L other'
350 'contrib', 'simplemerge')
350 % os.path.join(TESTDIR, os.path.pardir, 'contrib',
351 'simplemerge'))
351 os.environ["HGUSER"] = "test"
352 os.environ["HGUSER"] = "test"
352 os.environ["HGENCODING"] = "ascii"
353 os.environ["HGENCODING"] = "ascii"
353 os.environ["HGENCODINGMODE"] = "strict"
354 os.environ["HGENCODINGMODE"] = "strict"
@@ -11,5 +11,5 b' echo "something else" > a'
11 hg commit -m branch2 -d "1000000 0"
11 hg commit -m branch2 -d "1000000 0"
12 hg merge 1
12 hg merge 1
13 hg id
13 hg id
14 egrep -v ">>>|<<<" a
14 cat a
15 hg status
15 hg status
@@ -7,7 +7,9 b' There are unresolved merges, you can red'
7 hg update -C 2
7 hg update -C 2
8 hg merge 1
8 hg merge 1
9 e7fe8eb3e180+0d24b7662d3e+ tip
9 e7fe8eb3e180+0d24b7662d3e+ tip
10 <<<<<<< my
10 something else
11 something else
11 =======
12 =======
12 something
13 something
14 >>>>>>> other
13 M a
15 M a
@@ -27,7 +27,7 b' hg id'
27 hg update -C 0
27 hg update -C 0
28 echo "changed file1 different" >> file1
28 echo "changed file1 different" >> file1
29 hg update
29 hg update
30 hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
30 hg diff --nodates
31 hg status
31 hg status
32 hg id
32 hg id
33 hg revert --no-backup --all
33 hg revert --no-backup --all
@@ -23,11 +23,11 b' diff -r f248da0d4c3e file1'
23 @@ -1,3 +1,7 @@ added file1
23 @@ -1,3 +1,7 @@ added file1
24 added file1
24 added file1
25 another line of text
25 another line of text
26 +<<<<<<<
26 +<<<<<<< my
27 +changed file1 different
27 +changed file1 different
28 +=======
28 +=======
29 changed file1
29 changed file1
30 +>>>>>>>
30 +>>>>>>> other
31 M file1
31 M file1
32 f248da0d4c3e+ tip
32 f248da0d4c3e+ tip
33 reverting file1
33 reverting file1
@@ -59,7 +59,7 b' cd ../test-b'
59 hg pull ../test-a
59 hg pull ../test-a
60 hg merge --debug
60 hg merge --debug
61
61
62 cat test.txt | sed "s% .*%%"
62 cat test.txt
63
63
64 hg debugindex .hg/store/data/test.txt.i
64 hg debugindex .hg/store/data/test.txt.i
65
65
@@ -33,11 +33,11 b' There are unresolved merges, you can red'
33 hg update -C 3
33 hg update -C 3
34 hg merge 4
34 hg merge 4
35 one
35 one
36 <<<<<<<
36 <<<<<<< my
37 two-point-five
37 two-point-five
38 =======
38 =======
39 two-point-one
39 two-point-one
40 >>>>>>>
40 >>>>>>> other
41 three
41 three
42 rev offset length base linkrev nodeid p1 p2
42 rev offset length base linkrev nodeid p1 p2
43 0 0 7 0 0 01365c4cca56 000000000000 000000000000
43 0 0 7 0 0 01365c4cca56 000000000000 000000000000
General Comments 0
You need to be logged in to leave comments. Login now