233
234
235
236
237
238
239
240
241
242
243
244
245
|
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
+
+
+
+
+
-
+
+
+
+
+
+
+
|
278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
}
fossil undo
# Merge br5 (which includes a file rename) into chng3
#
fossil update chng3
checkout-test 130 {
6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
}
fossil merge br5
checkout-test 130 {
checkout-test 131 {
7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt
98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt
e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt
}
fossil undo
checkout-test 132 {
6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
}
|