Fossil SCM
The stash now uses the legacy behaviour for merge conflicts, always keeping the baseline/original/merge files, because there's otherwise a potential for undo suffering when stash pop has a conflict. (Thanks to Florian for pointing that out.)
Commit
31dc956dfa37931980f78b0e5dc7b3d35e0ee926d981067a357f9949aa0d641a
Parent
1bfd760de440e20…
1 file changed
+1
-1
+1
-1
| --- src/stash.c | ||
| +++ src/stash.c | ||
| @@ -359,11 +359,11 @@ | ||
| 359 | 359 | if( isLink || isNewLink ){ |
| 360 | 360 | rc = -1; |
| 361 | 361 | blob_zero(&b); /* because we reset it later */ |
| 362 | 362 | fossil_print("***** Cannot merge symlink %s\n", zNew); |
| 363 | 363 | }else{ |
| 364 | - rc = merge_3way(&a, zOPath, &b, &out, 0); | |
| 364 | + rc = merge_3way(&a, zOPath, &b, &out, MERGE_KEEP_FILES); | |
| 365 | 365 | blob_write_to_file(&out, zNPath); |
| 366 | 366 | blob_reset(&out); |
| 367 | 367 | file_setexe(zNPath, isExec); |
| 368 | 368 | } |
| 369 | 369 | if( rc ){ |
| 370 | 370 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -359,11 +359,11 @@ | |
| 359 | if( isLink || isNewLink ){ |
| 360 | rc = -1; |
| 361 | blob_zero(&b); /* because we reset it later */ |
| 362 | fossil_print("***** Cannot merge symlink %s\n", zNew); |
| 363 | }else{ |
| 364 | rc = merge_3way(&a, zOPath, &b, &out, 0); |
| 365 | blob_write_to_file(&out, zNPath); |
| 366 | blob_reset(&out); |
| 367 | file_setexe(zNPath, isExec); |
| 368 | } |
| 369 | if( rc ){ |
| 370 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -359,11 +359,11 @@ | |
| 359 | if( isLink || isNewLink ){ |
| 360 | rc = -1; |
| 361 | blob_zero(&b); /* because we reset it later */ |
| 362 | fossil_print("***** Cannot merge symlink %s\n", zNew); |
| 363 | }else{ |
| 364 | rc = merge_3way(&a, zOPath, &b, &out, MERGE_KEEP_FILES); |
| 365 | blob_write_to_file(&out, zNPath); |
| 366 | blob_reset(&out); |
| 367 | file_setexe(zNPath, isExec); |
| 368 | } |
| 369 | if( rc ){ |
| 370 |