Fossil SCM
When --force is specified do not treat a branch name change that arrives during autosync as fatal.
Commit
82fee40e14cb487319df4ccf8a94552ccdc4c9aa8125b89cc2a7d97d84446478
Parent
4e7e1647de94406…
1 file changed
+1
+1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2723,10 +2723,11 @@ | ||
| 2723 | 2723 | ** has changed and the committer did not provide the same branch |
| 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 | + && forceFlag==0 | |
| 2728 | 2729 | ){ |
| 2729 | 2730 | fossil_warning("parent check-in [%.10s] branch changed from '%s' to '%s'", |
| 2730 | 2731 | rid_to_uuid(vid), zCurBranch, zNewBranch); |
| 2731 | 2732 | if( !noPrompt ){ |
| 2732 | 2733 | prompt_user("continue (y/N)? ", &ans); |
| 2733 | 2734 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2723,10 +2723,11 @@ | |
| 2723 | ** has changed and the committer did not provide the same branch |
| 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 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2723,10 +2723,11 @@ | |
| 2723 | ** has changed and the committer did not provide the same branch |
| 2724 | */ |
| 2725 | zNewBranch = branch_of_rid(vid); |
| 2726 | if( fossil_strcmp(zCurBranch, zNewBranch)!=0 |
| 2727 | && fossil_strcmp(sCiInfo.zBranch, zNewBranch)!=0 |
| 2728 | && forceFlag==0 |
| 2729 | ){ |
| 2730 | fossil_warning("parent check-in [%.10s] branch changed from '%s' to '%s'", |
| 2731 | rid_to_uuid(vid), zCurBranch, zNewBranch); |
| 2732 | if( !noPrompt ){ |
| 2733 | prompt_user("continue (y/N)? ", &ans); |
| 2734 |