Fossil SCM
Minor tweaks to the wording of the warning message that is show when commited to a moved branch.
Commit
8cfa177f648beebe3027d491a22be6ae04cc7696ac877bf4765c1d1da4593bdd
Parent
c34cf8352e7b9d7…
1 file changed
+6
-3
+6
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2538,13 +2538,16 @@ | ||
| 2538 | 2538 | if( zCurBranch!=0 && zCurBranch[0]!=0 |
| 2539 | 2539 | && forceFlag==0 |
| 2540 | 2540 | && noPrompt==0 |
| 2541 | 2541 | ){ |
| 2542 | 2542 | zNewBranch = branch_of_rid(vid); |
| 2543 | - fossil_warning("parent check-in [%.10s] branch changed from '%s' to '%s'", | |
| 2544 | - rid_to_uuid(vid), zCurBranch, zNewBranch); | |
| 2545 | - prompt_user("continue (y/N)? ", &ans); | |
| 2543 | + fossil_warning( | |
| 2544 | + "WARNING: The parent check-in [%.10s] has been moved from branch\n" | |
| 2545 | + " '%s' over to branch '%s'.", | |
| 2546 | + rid_to_uuid(vid), zCurBranch, zNewBranch | |
| 2547 | + ); | |
| 2548 | + prompt_user("Commit anyway? (y/N) ", &ans); | |
| 2546 | 2549 | cReply = blob_str(&ans)[0]; |
| 2547 | 2550 | blob_reset(&ans); |
| 2548 | 2551 | if( cReply!='y' && cReply!='Y' ){ |
| 2549 | 2552 | fossil_fatal("Abandoning commit because branch has changed"); |
| 2550 | 2553 | } |
| 2551 | 2554 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2538,13 +2538,16 @@ | |
| 2538 | if( zCurBranch!=0 && zCurBranch[0]!=0 |
| 2539 | && forceFlag==0 |
| 2540 | && noPrompt==0 |
| 2541 | ){ |
| 2542 | zNewBranch = branch_of_rid(vid); |
| 2543 | fossil_warning("parent check-in [%.10s] branch changed from '%s' to '%s'", |
| 2544 | rid_to_uuid(vid), zCurBranch, zNewBranch); |
| 2545 | prompt_user("continue (y/N)? ", &ans); |
| 2546 | cReply = blob_str(&ans)[0]; |
| 2547 | blob_reset(&ans); |
| 2548 | if( cReply!='y' && cReply!='Y' ){ |
| 2549 | fossil_fatal("Abandoning commit because branch has changed"); |
| 2550 | } |
| 2551 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2538,13 +2538,16 @@ | |
| 2538 | if( zCurBranch!=0 && zCurBranch[0]!=0 |
| 2539 | && forceFlag==0 |
| 2540 | && noPrompt==0 |
| 2541 | ){ |
| 2542 | zNewBranch = branch_of_rid(vid); |
| 2543 | fossil_warning( |
| 2544 | "WARNING: The parent check-in [%.10s] has been moved from branch\n" |
| 2545 | " '%s' over to branch '%s'.", |
| 2546 | rid_to_uuid(vid), zCurBranch, zNewBranch |
| 2547 | ); |
| 2548 | prompt_user("Commit anyway? (y/N) ", &ans); |
| 2549 | cReply = blob_str(&ans)[0]; |
| 2550 | blob_reset(&ans); |
| 2551 | if( cReply!='y' && cReply!='Y' ){ |
| 2552 | fossil_fatal("Abandoning commit because branch has changed"); |
| 2553 | } |
| 2554 |