250
251
252
253
254
255
256
|
}
fossil undo
checkout-test 132 {
6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
}
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
|
}
fossil undo
checkout-test 132 {
6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
}
fossil merge br5
checkout-test 131 {
7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt
98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt
e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt
}
fossil commit -nosign -m {merge with rename} -branch {trunk+br5}
checkout-test 133 {
7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt
98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt
e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt
}
fossil update chng3
checkout-test 134 {
6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
}
fossil update trunk+br5
checkout-test 135 {
7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt
98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt
e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt
}
|