Fossil SCM
Fix another graph layout bug.
Commit
f312587a650ad4db7e80043d8622709d646b7fc7
Parent
b05cb4a0e15d071…
1 file changed
+6
+6
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -261,10 +261,16 @@ | ||
| 261 | 261 | pDesc=pDesc->pNext){} |
| 262 | 262 | if( pDesc==0 ) continue; |
| 263 | 263 | if( pDesc->mergeOut<0 ){ |
| 264 | 264 | pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0); |
| 265 | 265 | pDesc->mergeUpto = pRow->idx; |
| 266 | + mask = 1<<pDesc->mergeOut; | |
| 267 | + pDesc->railInUse |= mask; | |
| 268 | + for(pDesc=pRow->pNext; pDesc && pDesc->rid!=parentRid; | |
| 269 | + pDesc=pDesc->pNext){ | |
| 270 | + pDesc->railInUse |= mask; | |
| 271 | + } | |
| 266 | 272 | } |
| 267 | 273 | pRow->mergeIn |= 1<<pDesc->mergeOut; |
| 268 | 274 | } |
| 269 | 275 | } |
| 270 | 276 | |
| 271 | 277 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -261,10 +261,16 @@ | |
| 261 | pDesc=pDesc->pNext){} |
| 262 | if( pDesc==0 ) continue; |
| 263 | if( pDesc->mergeOut<0 ){ |
| 264 | pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0); |
| 265 | pDesc->mergeUpto = pRow->idx; |
| 266 | } |
| 267 | pRow->mergeIn |= 1<<pDesc->mergeOut; |
| 268 | } |
| 269 | } |
| 270 | |
| 271 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -261,10 +261,16 @@ | |
| 261 | pDesc=pDesc->pNext){} |
| 262 | if( pDesc==0 ) continue; |
| 263 | if( pDesc->mergeOut<0 ){ |
| 264 | pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0); |
| 265 | pDesc->mergeUpto = pRow->idx; |
| 266 | mask = 1<<pDesc->mergeOut; |
| 267 | pDesc->railInUse |= mask; |
| 268 | for(pDesc=pRow->pNext; pDesc && pDesc->rid!=parentRid; |
| 269 | pDesc=pDesc->pNext){ |
| 270 | pDesc->railInUse |= mask; |
| 271 | } |
| 272 | } |
| 273 | pRow->mergeIn |= 1<<pDesc->mergeOut; |
| 274 | } |
| 275 | } |
| 276 | |
| 277 |