Fossil SCM
Need to keep the TIMELINE_DISJOINT flag on branch timelines.
Commit
5cc74bff9d113aec9479db0aa9db7ce25b8c766bbbca88361b0f343cd3695954
Parent
bb0faeb8893d0d7…
1 file changed
+1
-1
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1692,11 +1692,11 @@ | ||
| 1692 | 1692 | }else{ |
| 1693 | 1693 | tmFlags |= TIMELINE_GRAPH | TIMELINE_CHPICK; |
| 1694 | 1694 | } |
| 1695 | 1695 | if( related ){ |
| 1696 | 1696 | tmFlags |= TIMELINE_FILLGAPS; |
| 1697 | - tmFlags &= ~TIMELINE_DISJOINT; | |
| 1697 | +// tmFlags &= ~TIMELINE_DISJOINT; | |
| 1698 | 1698 | } |
| 1699 | 1699 | if( PB("ncp") ){ |
| 1700 | 1700 | tmFlags &= ~TIMELINE_CHPICK; |
| 1701 | 1701 | } |
| 1702 | 1702 | if( PB("ng") || zSearch!=0 ){ |
| 1703 | 1703 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1692,11 +1692,11 @@ | |
| 1692 | }else{ |
| 1693 | tmFlags |= TIMELINE_GRAPH | TIMELINE_CHPICK; |
| 1694 | } |
| 1695 | if( related ){ |
| 1696 | tmFlags |= TIMELINE_FILLGAPS; |
| 1697 | tmFlags &= ~TIMELINE_DISJOINT; |
| 1698 | } |
| 1699 | if( PB("ncp") ){ |
| 1700 | tmFlags &= ~TIMELINE_CHPICK; |
| 1701 | } |
| 1702 | if( PB("ng") || zSearch!=0 ){ |
| 1703 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1692,11 +1692,11 @@ | |
| 1692 | }else{ |
| 1693 | tmFlags |= TIMELINE_GRAPH | TIMELINE_CHPICK; |
| 1694 | } |
| 1695 | if( related ){ |
| 1696 | tmFlags |= TIMELINE_FILLGAPS; |
| 1697 | // tmFlags &= ~TIMELINE_DISJOINT; |
| 1698 | } |
| 1699 | if( PB("ncp") ){ |
| 1700 | tmFlags &= ~TIMELINE_CHPICK; |
| 1701 | } |
| 1702 | if( PB("ng") || zSearch!=0 ){ |
| 1703 |