Fossil SCM
When trying to rename a branch into itself, make this a NOP.
Commit
95a809500a8da374e2aa40ccc6d9179d49abdab8
Parent
4a43e31549a207c…
1 file changed
+5
-2
+5
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2322,12 +2322,15 @@ | ||
| 2322 | 2322 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2323 | 2323 | @ <td valign="top"> |
| 2324 | 2324 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) /> |
| 2325 | 2325 | @ Make this check-in the start of a new branch named:</label> |
| 2326 | 2326 | @ <input type="text" style="width:15;" name="brname" value="%h(zNewBranch)" |
| 2327 | - @ onkeyup="gebi('newbr').checked=!!this.value" /> | |
| 2328 | - @ </td></tr> | |
| 2327 | + @ onkeyup="gebi('newbr').checked=!!this.value | |
| 2328 | + if( zBranchName ){ | |
| 2329 | + @ && this.value!='%h(zBranchName)' | |
| 2330 | + } | |
| 2331 | + @ " /></td></tr> | |
| 2329 | 2332 | |
| 2330 | 2333 | if( !fHasClosed ){ |
| 2331 | 2334 | if( is_a_leaf(rid) ){ |
| 2332 | 2335 | @ <tr><th align="right" valign="top">Leaf Closure:</th> |
| 2333 | 2336 | @ <td valign="top"> |
| 2334 | 2337 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2322,12 +2322,15 @@ | |
| 2322 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2323 | @ <td valign="top"> |
| 2324 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) /> |
| 2325 | @ Make this check-in the start of a new branch named:</label> |
| 2326 | @ <input type="text" style="width:15;" name="brname" value="%h(zNewBranch)" |
| 2327 | @ onkeyup="gebi('newbr').checked=!!this.value" /> |
| 2328 | @ </td></tr> |
| 2329 | |
| 2330 | if( !fHasClosed ){ |
| 2331 | if( is_a_leaf(rid) ){ |
| 2332 | @ <tr><th align="right" valign="top">Leaf Closure:</th> |
| 2333 | @ <td valign="top"> |
| 2334 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2322,12 +2322,15 @@ | |
| 2322 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2323 | @ <td valign="top"> |
| 2324 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) /> |
| 2325 | @ Make this check-in the start of a new branch named:</label> |
| 2326 | @ <input type="text" style="width:15;" name="brname" value="%h(zNewBranch)" |
| 2327 | @ onkeyup="gebi('newbr').checked=!!this.value |
| 2328 | if( zBranchName ){ |
| 2329 | @ && this.value!='%h(zBranchName)' |
| 2330 | } |
| 2331 | @ " /></td></tr> |
| 2332 | |
| 2333 | if( !fHasClosed ){ |
| 2334 | if( is_a_leaf(rid) ){ |
| 2335 | @ <tr><th align="right" valign="top">Leaf Closure:</th> |
| 2336 | @ <td valign="top"> |
| 2337 |