Fossil SCM
Attempting to do a better job of merging renames.
Commit
f0359882c9b5adf9b3704438cfbd6c1b34f3cd12
Parent
a932b744332916c…
1 file changed
+5
-1
+5
-1
| --- src/path.c | ||
| +++ src/path.c | ||
| @@ -133,11 +133,15 @@ | ||
| 133 | 133 | path.pStart = path_new_node(iFrom, 0, 0); |
| 134 | 134 | if( iTo==iFrom ){ |
| 135 | 135 | path.pEnd = path.pStart; |
| 136 | 136 | return path.pStart; |
| 137 | 137 | } |
| 138 | - if( oneWayOnly ){ | |
| 138 | + if( oneWayOnly && directOnly ){ | |
| 139 | + db_prepare(&s, | |
| 140 | + "SELECT cid, 1 FROM plink WHERE pid=:pid AND isprim" | |
| 141 | + ); | |
| 142 | + }else if( oneWayOnly ){ | |
| 139 | 143 | db_prepare(&s, |
| 140 | 144 | "SELECT cid, 1 FROM plink WHERE pid=:pid " |
| 141 | 145 | ); |
| 142 | 146 | }else if( directOnly ){ |
| 143 | 147 | db_prepare(&s, |
| 144 | 148 |
| --- src/path.c | |
| +++ src/path.c | |
| @@ -133,11 +133,15 @@ | |
| 133 | path.pStart = path_new_node(iFrom, 0, 0); |
| 134 | if( iTo==iFrom ){ |
| 135 | path.pEnd = path.pStart; |
| 136 | return path.pStart; |
| 137 | } |
| 138 | if( oneWayOnly ){ |
| 139 | db_prepare(&s, |
| 140 | "SELECT cid, 1 FROM plink WHERE pid=:pid " |
| 141 | ); |
| 142 | }else if( directOnly ){ |
| 143 | db_prepare(&s, |
| 144 |
| --- src/path.c | |
| +++ src/path.c | |
| @@ -133,11 +133,15 @@ | |
| 133 | path.pStart = path_new_node(iFrom, 0, 0); |
| 134 | if( iTo==iFrom ){ |
| 135 | path.pEnd = path.pStart; |
| 136 | return path.pStart; |
| 137 | } |
| 138 | if( oneWayOnly && directOnly ){ |
| 139 | db_prepare(&s, |
| 140 | "SELECT cid, 1 FROM plink WHERE pid=:pid AND isprim" |
| 141 | ); |
| 142 | }else if( oneWayOnly ){ |
| 143 | db_prepare(&s, |
| 144 | "SELECT cid, 1 FROM plink WHERE pid=:pid " |
| 145 | ); |
| 146 | }else if( directOnly ){ |
| 147 | db_prepare(&s, |
| 148 |