Fossil SCM
Merge risers must not go straight up to another node on the same rail.
Commit
38b52a5f0c0a710b1ace6a337f6a1e706294d7a1
Parent
9245076e5e4bb5f…
1 file changed
+2
-2
+2
-2
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -289,12 +289,12 @@ | ||
| 289 | 289 | u64 mask; |
| 290 | 290 | GraphRow *pLoop; |
| 291 | 291 | |
| 292 | 292 | if( pParent->mergeOut<0 ){ |
| 293 | 293 | u = pParent->aiRiser[pParent->iRail]; |
| 294 | - if( u>=0 && u<pChild->idx ){ | |
| 295 | - /* The thick arrow up to the next primary child of pDesc goes | |
| 294 | + if( u>=0 && u<pChild->idx && pParent->iRail!=pChild->iRail ){ | |
| 295 | + /* The thick arrow up to the next primary child of pParent goes | |
| 296 | 296 | ** further up than the thin merge arrow riser, so draw them both |
| 297 | 297 | ** on the same rail. */ |
| 298 | 298 | pParent->mergeOut = pParent->iRail; |
| 299 | 299 | pParent->mergeUpto = pChild->idx; |
| 300 | 300 | }else{ |
| 301 | 301 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -289,12 +289,12 @@ | |
| 289 | u64 mask; |
| 290 | GraphRow *pLoop; |
| 291 | |
| 292 | if( pParent->mergeOut<0 ){ |
| 293 | u = pParent->aiRiser[pParent->iRail]; |
| 294 | if( u>=0 && u<pChild->idx ){ |
| 295 | /* The thick arrow up to the next primary child of pDesc goes |
| 296 | ** further up than the thin merge arrow riser, so draw them both |
| 297 | ** on the same rail. */ |
| 298 | pParent->mergeOut = pParent->iRail; |
| 299 | pParent->mergeUpto = pChild->idx; |
| 300 | }else{ |
| 301 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -289,12 +289,12 @@ | |
| 289 | u64 mask; |
| 290 | GraphRow *pLoop; |
| 291 | |
| 292 | if( pParent->mergeOut<0 ){ |
| 293 | u = pParent->aiRiser[pParent->iRail]; |
| 294 | if( u>=0 && u<pChild->idx && pParent->iRail!=pChild->iRail ){ |
| 295 | /* The thick arrow up to the next primary child of pParent goes |
| 296 | ** further up than the thin merge arrow riser, so draw them both |
| 297 | ** on the same rail. */ |
| 298 | pParent->mergeOut = pParent->iRail; |
| 299 | pParent->mergeUpto = pChild->idx; |
| 300 | }else{ |
| 301 |