Fossil SCM

Replace 'exec mv/rm' with 'file rename/delete' in tests.

joel 2014-02-13 05:36 trunk
Commit c3d36f164ca87e71f5e3a007ada77f2439aaeff4
Parent 261c132280b2064…
2 files changed +6 -6 +2 -2
~ test/merge_renames.test ~ test/revert.test
M test/merge_renames.test
+6 -6
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -44,11 +44,11 @@
4444
 write_file f1 "line6"
4545
 fossil commit -m "c4"
4646
4747
 fossil update pivot
4848
 fossil mv f1 f2
49
-exec mv f1 f2
49
+file rename -force f1 f2
5050
 fossil commit -b rename -m "c5"
5151
5252
 fossil merge trunk
5353
 fossil commit -m "trunk merged"
5454
@@ -74,11 +74,11 @@
7474
 } else {
7575
 test merge_renames-1 1
7676
 }
7777
7878
 fossil close -f
79
-exec rm rep.fossil
79
+file delete rep.fossil
8080
8181
 ######################################
8282
 # Test 2 #
8383
 # Reported: Ticket [74413366fe5067] #
8484
 ######################################
@@ -94,11 +94,11 @@
9494
 write_file f2 "line2"
9595
 fossil add f2
9696
 fossil commit -m "newfile"
9797
9898
 fossil mv f2 f2new
99
-exec mv f2 f2new
99
+file rename -force f2 f2new
100100
 fossil commit -m "rename"
101101
102102
 fossil update pivot
103103
 write_file f1 "line3"
104104
 fossil commit -b branch -m "change"
@@ -126,11 +126,11 @@
126126
 } else {
127127
 test merge_renames-2 1
128128
 }
129129
130130
 fossil close -f
131
-exec rm rep.fossil
131
+file delete rep.fossil
132132
133133
 ######################################
134134
 # Test 3 #
135135
 # Reported: Ticket [30b28cf351] #
136136
 ######################################
@@ -146,11 +146,11 @@
146146
 write_file f2 "line2"
147147
 fossil add f2
148148
 fossil commit -m "newfile"
149149
150150
 fossil mv f2 f2new
151
-exec mv f2 f2new
151
+file rename -force f2 f2new
152152
 fossil commit -m "rename"
153153
154154
 fossil update pivot
155155
 write_file f1 "line3"
156156
 fossil commit -b branch -m "change"
@@ -178,11 +178,11 @@
178178
 } else {
179179
 test merge_renames-2 1
180180
 }
181181
182182
 fossil close -f
183
-exec rm rep.fossil
183
+file delete rep.fossil
184184
185185
 ######################################
186186
 # Test 4 #
187187
 # Reported: Ticket [67176c3aa4] #
188188
 ######################################
189189
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -44,11 +44,11 @@
44 write_file f1 "line6"
45 fossil commit -m "c4"
46
47 fossil update pivot
48 fossil mv f1 f2
49 exec mv f1 f2
50 fossil commit -b rename -m "c5"
51
52 fossil merge trunk
53 fossil commit -m "trunk merged"
54
@@ -74,11 +74,11 @@
74 } else {
75 test merge_renames-1 1
76 }
77
78 fossil close -f
79 exec rm rep.fossil
80
81 ######################################
82 # Test 2 #
83 # Reported: Ticket [74413366fe5067] #
84 ######################################
@@ -94,11 +94,11 @@
94 write_file f2 "line2"
95 fossil add f2
96 fossil commit -m "newfile"
97
98 fossil mv f2 f2new
99 exec mv f2 f2new
100 fossil commit -m "rename"
101
102 fossil update pivot
103 write_file f1 "line3"
104 fossil commit -b branch -m "change"
@@ -126,11 +126,11 @@
126 } else {
127 test merge_renames-2 1
128 }
129
130 fossil close -f
131 exec rm rep.fossil
132
133 ######################################
134 # Test 3 #
135 # Reported: Ticket [30b28cf351] #
136 ######################################
@@ -146,11 +146,11 @@
146 write_file f2 "line2"
147 fossil add f2
148 fossil commit -m "newfile"
149
150 fossil mv f2 f2new
151 exec mv f2 f2new
152 fossil commit -m "rename"
153
154 fossil update pivot
155 write_file f1 "line3"
156 fossil commit -b branch -m "change"
@@ -178,11 +178,11 @@
178 } else {
179 test merge_renames-2 1
180 }
181
182 fossil close -f
183 exec rm rep.fossil
184
185 ######################################
186 # Test 4 #
187 # Reported: Ticket [67176c3aa4] #
188 ######################################
189
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -44,11 +44,11 @@
44 write_file f1 "line6"
45 fossil commit -m "c4"
46
47 fossil update pivot
48 fossil mv f1 f2
49 file rename -force f1 f2
50 fossil commit -b rename -m "c5"
51
52 fossil merge trunk
53 fossil commit -m "trunk merged"
54
@@ -74,11 +74,11 @@
74 } else {
75 test merge_renames-1 1
76 }
77
78 fossil close -f
79 file delete rep.fossil
80
81 ######################################
82 # Test 2 #
83 # Reported: Ticket [74413366fe5067] #
84 ######################################
@@ -94,11 +94,11 @@
94 write_file f2 "line2"
95 fossil add f2
96 fossil commit -m "newfile"
97
98 fossil mv f2 f2new
99 file rename -force f2 f2new
100 fossil commit -m "rename"
101
102 fossil update pivot
103 write_file f1 "line3"
104 fossil commit -b branch -m "change"
@@ -126,11 +126,11 @@
126 } else {
127 test merge_renames-2 1
128 }
129
130 fossil close -f
131 file delete rep.fossil
132
133 ######################################
134 # Test 3 #
135 # Reported: Ticket [30b28cf351] #
136 ######################################
@@ -146,11 +146,11 @@
146 write_file f2 "line2"
147 fossil add f2
148 fossil commit -m "newfile"
149
150 fossil mv f2 f2new
151 file rename -force f2 f2new
152 fossil commit -m "rename"
153
154 fossil update pivot
155 write_file f1 "line3"
156 fossil commit -b branch -m "change"
@@ -178,11 +178,11 @@
178 } else {
179 test merge_renames-2 1
180 }
181
182 fossil close -f
183 file delete rep.fossil
184
185 ######################################
186 # Test 4 #
187 # Reported: Ticket [67176c3aa4] #
188 ######################################
189
M test/revert.test
+2 -2
--- test/revert.test
+++ test/revert.test
@@ -91,16 +91,16 @@
9191
 #
9292
 # Add f0
9393
 write_file f0 "f0"
9494
 fossil add f0
9595
 # Remove f1
96
-exec rm f1
96
+file delete f1
9797
 fossil rm f1
9898
 # Edit f2
9999
 write_file f2 "f2.1"
100100
 # Rename f3 to f3n
101
-exec mv f3 f3n
101
+file rename -force f3 f3n
102102
 fossil mv f3 f3n
103103
104104
 # Test 'fossil revert' with no arguments
105105
 #
106106
 revert-test 1 -addremove {
107107
--- test/revert.test
+++ test/revert.test
@@ -91,16 +91,16 @@
91 #
92 # Add f0
93 write_file f0 "f0"
94 fossil add f0
95 # Remove f1
96 exec rm f1
97 fossil rm f1
98 # Edit f2
99 write_file f2 "f2.1"
100 # Rename f3 to f3n
101 exec mv f3 f3n
102 fossil mv f3 f3n
103
104 # Test 'fossil revert' with no arguments
105 #
106 revert-test 1 -addremove {
107
--- test/revert.test
+++ test/revert.test
@@ -91,16 +91,16 @@
91 #
92 # Add f0
93 write_file f0 "f0"
94 fossil add f0
95 # Remove f1
96 file delete f1
97 fossil rm f1
98 # Edit f2
99 write_file f2 "f2.1"
100 # Rename f3 to f3n
101 file rename -force f3 f3n
102 fossil mv f3 f3n
103
104 # Test 'fossil revert' with no arguments
105 #
106 revert-test 1 -addremove {
107

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button