Fossil SCM
I think this conveys the message with slightly more clarity.
Commit
4e7e1647de944065e6dbbfb61933ffba5458a381ec5da456e724d286dd22fa31
Parent
a70f279a1d25671…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2724,11 +2724,11 @@ | ||
| 2724 | 2724 | */ |
| 2725 | 2725 | zNewBranch = branch_of_rid(vid); |
| 2726 | 2726 | if( fossil_strcmp(zCurBranch, zNewBranch)!=0 |
| 2727 | 2727 | && fossil_strcmp(sCiInfo.zBranch, zNewBranch)!=0 |
| 2728 | 2728 | ){ |
| 2729 | - fossil_warning("parent check-in [%.10s] changed branch from '%s' to '%s'", | |
| 2729 | + fossil_warning("parent check-in [%.10s] branch changed from '%s' to '%s'", | |
| 2730 | 2730 | rid_to_uuid(vid), zCurBranch, zNewBranch); |
| 2731 | 2731 | if( !noPrompt ){ |
| 2732 | 2732 | prompt_user("continue (y/N)? ", &ans); |
| 2733 | 2733 | cReply = blob_str(&ans)[0]; |
| 2734 | 2734 | blob_reset(&ans); |
| 2735 | 2735 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2724,11 +2724,11 @@ | |
| 2724 | */ |
| 2725 | zNewBranch = branch_of_rid(vid); |
| 2726 | if( fossil_strcmp(zCurBranch, zNewBranch)!=0 |
| 2727 | && fossil_strcmp(sCiInfo.zBranch, zNewBranch)!=0 |
| 2728 | ){ |
| 2729 | fossil_warning("parent check-in [%.10s] changed branch from '%s' to '%s'", |
| 2730 | rid_to_uuid(vid), zCurBranch, zNewBranch); |
| 2731 | if( !noPrompt ){ |
| 2732 | prompt_user("continue (y/N)? ", &ans); |
| 2733 | cReply = blob_str(&ans)[0]; |
| 2734 | blob_reset(&ans); |
| 2735 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2724,11 +2724,11 @@ | |
| 2724 | */ |
| 2725 | zNewBranch = branch_of_rid(vid); |
| 2726 | if( fossil_strcmp(zCurBranch, zNewBranch)!=0 |
| 2727 | && fossil_strcmp(sCiInfo.zBranch, zNewBranch)!=0 |
| 2728 | ){ |
| 2729 | fossil_warning("parent check-in [%.10s] branch changed from '%s' to '%s'", |
| 2730 | rid_to_uuid(vid), zCurBranch, zNewBranch); |
| 2731 | if( !noPrompt ){ |
| 2732 | prompt_user("continue (y/N)? ", &ans); |
| 2733 | cReply = blob_str(&ans)[0]; |
| 2734 | blob_reset(&ans); |
| 2735 |