Fossil SCM
Allow committing as follow-up on a closed leaf, as long as it is done in a new branch. Suggested by Matt Welland on ML.
Commit
2b79c600d545e8c6685a8ae7ac8b951ead644c48
Parent
a0c8a0869def6c5…
1 file changed
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1677,13 +1677,13 @@ | ||
| 1677 | 1677 | ){ |
| 1678 | 1678 | fossil_fatal("would fork. \"update\" first or use --allow-fork."); |
| 1679 | 1679 | } |
| 1680 | 1680 | |
| 1681 | 1681 | /* |
| 1682 | - ** Do not allow a commit against a closed leaf | |
| 1682 | + ** Do not allow a commit against a closed leaf on the same branch. | |
| 1683 | 1683 | */ |
| 1684 | - if( db_exists("SELECT 1 FROM tagxref" | |
| 1684 | + if( !sCiInfo.zBranch && db_exists("SELECT 1 FROM tagxref" | |
| 1685 | 1685 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 1686 | 1686 | TAG_CLOSED, vid) ){ |
| 1687 | 1687 | fossil_fatal("cannot commit against a closed leaf"); |
| 1688 | 1688 | } |
| 1689 | 1689 | |
| 1690 | 1690 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1677,13 +1677,13 @@ | |
| 1677 | ){ |
| 1678 | fossil_fatal("would fork. \"update\" first or use --allow-fork."); |
| 1679 | } |
| 1680 | |
| 1681 | /* |
| 1682 | ** Do not allow a commit against a closed leaf |
| 1683 | */ |
| 1684 | if( db_exists("SELECT 1 FROM tagxref" |
| 1685 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 1686 | TAG_CLOSED, vid) ){ |
| 1687 | fossil_fatal("cannot commit against a closed leaf"); |
| 1688 | } |
| 1689 | |
| 1690 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1677,13 +1677,13 @@ | |
| 1677 | ){ |
| 1678 | fossil_fatal("would fork. \"update\" first or use --allow-fork."); |
| 1679 | } |
| 1680 | |
| 1681 | /* |
| 1682 | ** Do not allow a commit against a closed leaf on the same branch. |
| 1683 | */ |
| 1684 | if( !sCiInfo.zBranch && db_exists("SELECT 1 FROM tagxref" |
| 1685 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 1686 | TAG_CLOSED, vid) ){ |
| 1687 | fossil_fatal("cannot commit against a closed leaf"); |
| 1688 | } |
| 1689 | |
| 1690 |