Fossil SCM
Fix the merge command so that file renames are only considered if they are on the shortest path between the pivot and the checkins being merged. Ticket [74413366fe5067b3d].
Commit
ff2a87103bf16f4781182cd66cef550cbbaecc3a
Parent
44766975234ece0…
1 file changed
+1
-1
+1
-1
| --- src/bisect.c | ||
| +++ src/bisect.c | ||
| @@ -363,11 +363,11 @@ | ||
| 363 | 363 | Stmt q1; /* Query of name changes */ |
| 364 | 364 | |
| 365 | 365 | *pnChng = 0; |
| 366 | 366 | *aiChng = 0; |
| 367 | 367 | bisect_reset(); |
| 368 | - p = bisect_shortest_path(iFrom, iTo, 1); | |
| 368 | + p = bisect_shortest_path(iFrom, iTo, 0); | |
| 369 | 369 | if( p==0 ) return; |
| 370 | 370 | bisect_reverse_path(); |
| 371 | 371 | db_prepare(&q1, |
| 372 | 372 | "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0" |
| 373 | 373 | ); |
| 374 | 374 |
| --- src/bisect.c | |
| +++ src/bisect.c | |
| @@ -363,11 +363,11 @@ | |
| 363 | Stmt q1; /* Query of name changes */ |
| 364 | |
| 365 | *pnChng = 0; |
| 366 | *aiChng = 0; |
| 367 | bisect_reset(); |
| 368 | p = bisect_shortest_path(iFrom, iTo, 1); |
| 369 | if( p==0 ) return; |
| 370 | bisect_reverse_path(); |
| 371 | db_prepare(&q1, |
| 372 | "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0" |
| 373 | ); |
| 374 |
| --- src/bisect.c | |
| +++ src/bisect.c | |
| @@ -363,11 +363,11 @@ | |
| 363 | Stmt q1; /* Query of name changes */ |
| 364 | |
| 365 | *pnChng = 0; |
| 366 | *aiChng = 0; |
| 367 | bisect_reset(); |
| 368 | p = bisect_shortest_path(iFrom, iTo, 0); |
| 369 | if( p==0 ) return; |
| 370 | bisect_reverse_path(); |
| 371 | db_prepare(&q1, |
| 372 | "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0" |
| 373 | ); |
| 374 |