Fossil SCM
Fix merge_warn.test: warning about missing common ancestor changed to merge conflict warning. 👀
Commit
c38c0ff74cd21ce97c1820a693aa454beb7a0d56487a77529fae2249943a619c
Parent
34abaf0120a8315…
1 file changed
+4
-4
+4
-4
| --- test/merge_warn.test | ||
| +++ test/merge_warn.test | ||
| @@ -42,16 +42,16 @@ | ||
| 42 | 42 | fossil update trunk |
| 43 | 43 | write_file f1 "f1.1" |
| 44 | 44 | write_file f3 "f3.1" |
| 45 | 45 | fossil merge --integrate mrg |
| 46 | 46 | test_status_list merge_warn-1 $RESULT { |
| 47 | - WARNING: no common ancestor for f2 | |
| 47 | + WARNING: 1 unmanaged files were overwritten | |
| 48 | + WARNING: 2 merge conflicts | |
| 48 | 49 | DELETE f1 |
| 50 | + MERGE f2 | |
| 51 | + ADDED f3 (overwrites an unmanaged file), original copy backed up locally | |
| 49 | 52 | WARNING: local edits lost for f1 |
| 50 | - ADDED f3 (overwrites an unmanaged file) | |
| 51 | - WARNING: 1 merge conflicts | |
| 52 | - WARNING: 1 unmanaged files were overwritten | |
| 53 | 53 | } |
| 54 | 54 | test merge_warn-2 { |
| 55 | 55 | [string first "ignoring --integrate: mrg is not a leaf" $RESULT]>=0 |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 |
| --- test/merge_warn.test | |
| +++ test/merge_warn.test | |
| @@ -42,16 +42,16 @@ | |
| 42 | fossil update trunk |
| 43 | write_file f1 "f1.1" |
| 44 | write_file f3 "f3.1" |
| 45 | fossil merge --integrate mrg |
| 46 | test_status_list merge_warn-1 $RESULT { |
| 47 | WARNING: no common ancestor for f2 |
| 48 | DELETE f1 |
| 49 | WARNING: local edits lost for f1 |
| 50 | ADDED f3 (overwrites an unmanaged file) |
| 51 | WARNING: 1 merge conflicts |
| 52 | WARNING: 1 unmanaged files were overwritten |
| 53 | } |
| 54 | test merge_warn-2 { |
| 55 | [string first "ignoring --integrate: mrg is not a leaf" $RESULT]>=0 |
| 56 | } |
| 57 | |
| 58 |
| --- test/merge_warn.test | |
| +++ test/merge_warn.test | |
| @@ -42,16 +42,16 @@ | |
| 42 | fossil update trunk |
| 43 | write_file f1 "f1.1" |
| 44 | write_file f3 "f3.1" |
| 45 | fossil merge --integrate mrg |
| 46 | test_status_list merge_warn-1 $RESULT { |
| 47 | WARNING: 1 unmanaged files were overwritten |
| 48 | WARNING: 2 merge conflicts |
| 49 | DELETE f1 |
| 50 | MERGE f2 |
| 51 | ADDED f3 (overwrites an unmanaged file), original copy backed up locally |
| 52 | WARNING: local edits lost for f1 |
| 53 | } |
| 54 | test merge_warn-2 { |
| 55 | [string first "ignoring --integrate: mrg is not a leaf" $RESULT]>=0 |
| 56 | } |
| 57 | |
| 58 |