Fossil SCM
When doing a merge, only follow direct ancestor links when computing the set of filename changes. Do not follow merge links as this can result in non-intuitive changes. Ticket [554f44ee74e3d3b].
Commit
1c4d1272a621bbd58b39d034698b872109653ed8
Parent
b893eb0dad8744c…
1 file changed
+1
-1
+1
-1
| --- src/path.c | ||
| +++ src/path.c | ||
| @@ -366,11 +366,11 @@ | ||
| 366 | 366 | |
| 367 | 367 | *pnChng = 0; |
| 368 | 368 | *aiChng = 0; |
| 369 | 369 | if( iFrom==iTo ) return; |
| 370 | 370 | path_reset(); |
| 371 | - p = path_shortest(iFrom, iTo, 0); | |
| 371 | + p = path_shortest(iFrom, iTo, 1); | |
| 372 | 372 | if( p==0 ) return; |
| 373 | 373 | path_reverse_path(); |
| 374 | 374 | db_prepare(&q1, |
| 375 | 375 | "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0" |
| 376 | 376 | ); |
| 377 | 377 |
| --- src/path.c | |
| +++ src/path.c | |
| @@ -366,11 +366,11 @@ | |
| 366 | |
| 367 | *pnChng = 0; |
| 368 | *aiChng = 0; |
| 369 | if( iFrom==iTo ) return; |
| 370 | path_reset(); |
| 371 | p = path_shortest(iFrom, iTo, 0); |
| 372 | if( p==0 ) return; |
| 373 | path_reverse_path(); |
| 374 | db_prepare(&q1, |
| 375 | "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0" |
| 376 | ); |
| 377 |
| --- src/path.c | |
| +++ src/path.c | |
| @@ -366,11 +366,11 @@ | |
| 366 | |
| 367 | *pnChng = 0; |
| 368 | *aiChng = 0; |
| 369 | if( iFrom==iTo ) return; |
| 370 | path_reset(); |
| 371 | p = path_shortest(iFrom, iTo, 1); |
| 372 | if( p==0 ) return; |
| 373 | path_reverse_path(); |
| 374 | db_prepare(&q1, |
| 375 | "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0" |
| 376 | ); |
| 377 |