Fossil SCM
A few more merge test cases added.
Commit
3f490bcbcff2fa28147290203cbf6d1e541e4b8b
Parent
70744b76e641d6b…
1 file changed
+31
+31
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -196,5 +196,36 @@ | ||
| 196 | 196 | checkout-test 110 { |
| 197 | 197 | 6e167b139c294bed560e2e30b352361b101e1f39 four.txt |
| 198 | 198 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 199 | 199 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 200 | 200 | } |
| 201 | + | |
| 202 | +# Branches br1 and br4 both add file four.txt. So if we merge them together, | |
| 203 | +# the version of file four.txt in the original should be preserved. | |
| 204 | +# | |
| 205 | +fossil update br1 | |
| 206 | +checkout-test 120 { | |
| 207 | + 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt | |
| 208 | + da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt | |
| 209 | + ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt | |
| 210 | + 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt | |
| 211 | +} | |
| 212 | +fossil merge br4 | |
| 213 | +checkout-test 121 { | |
| 214 | + 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt | |
| 215 | + ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt | |
| 216 | + 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt | |
| 217 | +} | |
| 218 | +fossil undo | |
| 219 | +fossil update br4 | |
| 220 | +checkout-test 122 { | |
| 221 | + 6e167b139c294bed560e2e30b352361b101e1f39 four.txt | |
| 222 | + ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt | |
| 223 | + 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt | |
| 224 | +} | |
| 225 | +fossil merge br1 | |
| 226 | +checkout-test 123 { | |
| 227 | + 6e167b139c294bed560e2e30b352361b101e1f39 four.txt | |
| 228 | + ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt | |
| 229 | + 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt | |
| 230 | +} | |
| 231 | +fossil undo | |
| 201 | 232 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -196,5 +196,36 @@ | |
| 196 | checkout-test 110 { |
| 197 | 6e167b139c294bed560e2e30b352361b101e1f39 four.txt |
| 198 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 199 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 200 | } |
| 201 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -196,5 +196,36 @@ | |
| 196 | checkout-test 110 { |
| 197 | 6e167b139c294bed560e2e30b352361b101e1f39 four.txt |
| 198 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 199 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 200 | } |
| 201 | |
| 202 | # Branches br1 and br4 both add file four.txt. So if we merge them together, |
| 203 | # the version of file four.txt in the original should be preserved. |
| 204 | # |
| 205 | fossil update br1 |
| 206 | checkout-test 120 { |
| 207 | 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt |
| 208 | da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt |
| 209 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 210 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 211 | } |
| 212 | fossil merge br4 |
| 213 | checkout-test 121 { |
| 214 | 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt |
| 215 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 216 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 217 | } |
| 218 | fossil undo |
| 219 | fossil update br4 |
| 220 | checkout-test 122 { |
| 221 | 6e167b139c294bed560e2e30b352361b101e1f39 four.txt |
| 222 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 223 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 224 | } |
| 225 | fossil merge br1 |
| 226 | checkout-test 123 { |
| 227 | 6e167b139c294bed560e2e30b352361b101e1f39 four.txt |
| 228 | ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
| 229 | 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt |
| 230 | } |
| 231 | fossil undo |
| 232 |