Fossil SCM
Allow the branch name to be changes in the check-in edit screen for a check-in that is the first check-in of a new branch.
Commit
af8a8979c679ca8545e0981d2ecd6c66b40e788f
Parent
99c26fccba3ed85…
1 file changed
+6
-9
+6
-9
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1439,19 +1439,16 @@ | ||
| 1439 | 1439 | } |
| 1440 | 1440 | } |
| 1441 | 1441 | db_finalize(&q); |
| 1442 | 1442 | @ </td></tr> |
| 1443 | 1443 | |
| 1444 | - if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d AND tagid=%d AND srcid>0", | |
| 1445 | - rid, TAG_BRANCH)==0 ){ | |
| 1446 | - @ <tr><td align="right" valign="top"><b>Branching:</b></td> | |
| 1447 | - @ <td valign="top"> | |
| 1448 | - @ <input type="checkbox" name="newbr"%s(zNewBrFlag)> | |
| 1449 | - @ Make this check-in the start of a new branch named: | |
| 1450 | - @ <input type="text" width="15" name="brname" value="%h(zNewBranch)"> | |
| 1451 | - @ </td></tr> | |
| 1452 | - } | |
| 1444 | + @ <tr><td align="right" valign="top"><b>Branching:</b></td> | |
| 1445 | + @ <td valign="top"> | |
| 1446 | + @ <input type="checkbox" name="newbr"%s(zNewBrFlag)> | |
| 1447 | + @ Make this check-in the start of a new branch named: | |
| 1448 | + @ <input type="text" width="15" name="brname" value="%h(zNewBranch)"> | |
| 1449 | + @ </td></tr> | |
| 1453 | 1450 | |
| 1454 | 1451 | if( is_a_leaf(rid) |
| 1455 | 1452 | && !db_exists("SELECT 1 FROM tagxref " |
| 1456 | 1453 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 1457 | 1454 | TAG_CLOSED, rid) |
| 1458 | 1455 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1439,19 +1439,16 @@ | |
| 1439 | } |
| 1440 | } |
| 1441 | db_finalize(&q); |
| 1442 | @ </td></tr> |
| 1443 | |
| 1444 | if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d AND tagid=%d AND srcid>0", |
| 1445 | rid, TAG_BRANCH)==0 ){ |
| 1446 | @ <tr><td align="right" valign="top"><b>Branching:</b></td> |
| 1447 | @ <td valign="top"> |
| 1448 | @ <input type="checkbox" name="newbr"%s(zNewBrFlag)> |
| 1449 | @ Make this check-in the start of a new branch named: |
| 1450 | @ <input type="text" width="15" name="brname" value="%h(zNewBranch)"> |
| 1451 | @ </td></tr> |
| 1452 | } |
| 1453 | |
| 1454 | if( is_a_leaf(rid) |
| 1455 | && !db_exists("SELECT 1 FROM tagxref " |
| 1456 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 1457 | TAG_CLOSED, rid) |
| 1458 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1439,19 +1439,16 @@ | |
| 1439 | } |
| 1440 | } |
| 1441 | db_finalize(&q); |
| 1442 | @ </td></tr> |
| 1443 | |
| 1444 | @ <tr><td align="right" valign="top"><b>Branching:</b></td> |
| 1445 | @ <td valign="top"> |
| 1446 | @ <input type="checkbox" name="newbr"%s(zNewBrFlag)> |
| 1447 | @ Make this check-in the start of a new branch named: |
| 1448 | @ <input type="text" width="15" name="brname" value="%h(zNewBranch)"> |
| 1449 | @ </td></tr> |
| 1450 | |
| 1451 | if( is_a_leaf(rid) |
| 1452 | && !db_exists("SELECT 1 FROM tagxref " |
| 1453 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 1454 | TAG_CLOSED, rid) |
| 1455 |