##// END OF EJS Templates
Update tests to match new addremove chattiness.
Bryan O'Sullivan -
r767:61ed30e8 default
parent child Browse files
Show More
@@ -27,6 +27,7 b''
27 + hg update 0
27 + hg update 0
28 + echo This is file b2
28 + echo This is file b2
29 + hg commit -A -m 'commit #2' -d '0 0'
29 + hg commit -A -m 'commit #2' -d '0 0'
30 adding b
30 + cd ..
31 + cd ..
31 + /bin/rm -rf t
32 + /bin/rm -rf t
32 + mkdir t
33 + mkdir t
@@ -43,5 +44,6 b''
43 + hg update 0
44 + hg update 0
44 + echo This is file b2
45 + echo This is file b2
45 + hg commit -A -m 'commit #2' -d '0 0'
46 + hg commit -A -m 'commit #2' -d '0 0'
47 adding b
46 + cd ..
48 + cd ..
47 + /bin/rm -rf t
49 + /bin/rm -rf t
@@ -6,4 +6,5 b''
6 + hg add b
6 + hg add b
7 + rm b
7 + rm b
8 + hg commit -A '-mcomment #1' -d '0 0'
8 + hg commit -A '-mcomment #1' -d '0 0'
9 removing b
9 b never committed!
10 b never committed!
@@ -10,6 +10,7 b''
10 + hg update 0
10 + hg update 0
11 + rm b
11 + rm b
12 + hg commit -A '-mcomment #2' -d '0 0'
12 + hg commit -A '-mcomment #2' -d '0 0'
13 removing b
13 + yes k
14 + yes k
14 + hg update 1
15 + hg update 1
15 this update spans a branch affecting the following files:
16 this update spans a branch affecting the following files:
@@ -1,3 +1,4 b''
1 adding foo
1 checking changesets
2 checking changesets
2 checking manifests
3 checking manifests
3 crosschecking files in changesets and manifests
4 crosschecking files in changesets and manifests
@@ -3,6 +3,7 b''
3 + echo foo
3 + echo foo
4 + hg init
4 + hg init
5 + hg addremove
5 + hg addremove
6 adding foo
6 + hg commit -m 1
7 + hg commit -m 1
7 + hg verify
8 + hg verify
8 checking changesets
9 checking changesets
@@ -3,6 +3,7 b''
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg addremove
5 + hg addremove
6 adding a
6 + hg commit -m 1 -d '0 0'
7 + hg commit -m 1 -d '0 0'
7 + hg clone . ../r2
8 + hg clone . ../r2
8 + cd ../r2
9 + cd ../r2
@@ -20,6 +21,7 b' diff -r c19d34741b0a a'
20 + echo b
21 + echo b
21 + echo a2
22 + echo a2
22 + hg addremove
23 + hg addremove
24 adding b
23 + hg commit -m 2 -d '0 0'
25 + hg commit -m 2 -d '0 0'
24 + cd ../r2
26 + cd ../r2
25 + hg -q pull ../r1
27 + hg -q pull ../r1
@@ -68,9 +70,3 b' 1'
68
70
69 + hg diff
71 + hg diff
70 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
71 diff -r 1e71731e6fbb a
72 --- a/a
73 +++ b/a
74 @@ -1,1 +1,1 @@
75 -a2
76 +abc
General Comments 0
You need to be logged in to leave comments. Login now