Fossil SCM
Remove unnecessary first commit (that isn't actually a commit because I didn't call "fossil add" first...) in test 8.
Commit
1385c8d456a4b2620d5a89faa6b5b8f0957e4670
Parent
8bf221e5345bf2d…
1 file changed
+8
-12
+8
-12
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -251,35 +251,31 @@ | ||
| 251 | 251 | # Merging two branches that both add the same file # |
| 252 | 252 | ###################################################### |
| 253 | 253 | |
| 254 | 254 | test_setup |
| 255 | 255 | |
| 256 | -write_file f1 "f1" | |
| 257 | -fossil commit -m "add f1" | |
| 256 | +write_file f1 "f1.1" | |
| 257 | +fossil add f1 | |
| 258 | +fossil commit -b b1 -m "add f1" | |
| 258 | 259 | |
| 259 | 260 | fossil update trunk |
| 260 | -write_file f2 "f2.1" | |
| 261 | -fossil add f2 | |
| 262 | -fossil commit -b b1 -m "add f2" | |
| 263 | - | |
| 264 | -fossil update trunk | |
| 265 | -write_file f2 "f2.2" | |
| 266 | -fossil add f2 | |
| 267 | -fossil commit -b b2 -m "add f2" | |
| 261 | +write_file f1 "f1.2" | |
| 262 | +fossil add f1 | |
| 263 | +fossil commit -b b2 -m "add f1" | |
| 268 | 264 | |
| 269 | 265 | fossil update trunk |
| 270 | 266 | fossil merge b1 |
| 271 | 267 | fossil merge b2 |
| 272 | 268 | test_status_list merge_renames-8-1 $RESULT { |
| 273 | - WARNING: no common ancestor for f2 | |
| 269 | + WARNING: no common ancestor for f1 | |
| 274 | 270 | } |
| 275 | 271 | |
| 276 | 272 | fossil revert |
| 277 | 273 | fossil merge --integrate b1 |
| 278 | 274 | fossil merge b2 |
| 279 | 275 | test_status_list merge_renames-8-2 $RESULT { |
| 280 | - WARNING: no common ancestor for f2 | |
| 276 | + WARNING: no common ancestor for f1 | |
| 281 | 277 | } |
| 282 | 278 | |
| 283 | 279 | ############################################# |
| 284 | 280 | # Test 9 # |
| 285 | 281 | # Merging a delete/rename/add combination # |
| 286 | 282 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -251,35 +251,31 @@ | |
| 251 | # Merging two branches that both add the same file # |
| 252 | ###################################################### |
| 253 | |
| 254 | test_setup |
| 255 | |
| 256 | write_file f1 "f1" |
| 257 | fossil commit -m "add f1" |
| 258 | |
| 259 | fossil update trunk |
| 260 | write_file f2 "f2.1" |
| 261 | fossil add f2 |
| 262 | fossil commit -b b1 -m "add f2" |
| 263 | |
| 264 | fossil update trunk |
| 265 | write_file f2 "f2.2" |
| 266 | fossil add f2 |
| 267 | fossil commit -b b2 -m "add f2" |
| 268 | |
| 269 | fossil update trunk |
| 270 | fossil merge b1 |
| 271 | fossil merge b2 |
| 272 | test_status_list merge_renames-8-1 $RESULT { |
| 273 | WARNING: no common ancestor for f2 |
| 274 | } |
| 275 | |
| 276 | fossil revert |
| 277 | fossil merge --integrate b1 |
| 278 | fossil merge b2 |
| 279 | test_status_list merge_renames-8-2 $RESULT { |
| 280 | WARNING: no common ancestor for f2 |
| 281 | } |
| 282 | |
| 283 | ############################################# |
| 284 | # Test 9 # |
| 285 | # Merging a delete/rename/add combination # |
| 286 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -251,35 +251,31 @@ | |
| 251 | # Merging two branches that both add the same file # |
| 252 | ###################################################### |
| 253 | |
| 254 | test_setup |
| 255 | |
| 256 | write_file f1 "f1.1" |
| 257 | fossil add f1 |
| 258 | fossil commit -b b1 -m "add f1" |
| 259 | |
| 260 | fossil update trunk |
| 261 | write_file f1 "f1.2" |
| 262 | fossil add f1 |
| 263 | fossil commit -b b2 -m "add f1" |
| 264 | |
| 265 | fossil update trunk |
| 266 | fossil merge b1 |
| 267 | fossil merge b2 |
| 268 | test_status_list merge_renames-8-1 $RESULT { |
| 269 | WARNING: no common ancestor for f1 |
| 270 | } |
| 271 | |
| 272 | fossil revert |
| 273 | fossil merge --integrate b1 |
| 274 | fossil merge b2 |
| 275 | test_status_list merge_renames-8-2 $RESULT { |
| 276 | WARNING: no common ancestor for f1 |
| 277 | } |
| 278 | |
| 279 | ############################################# |
| 280 | # Test 9 # |
| 281 | # Merging a delete/rename/add combination # |
| 282 |