Fossil SCM
correct merge conflict
Commit
0cb3ab794f9dd3208295c6724cd12b75340f1747
Parent
1d6cccc5528083f…
1 file changed
+2
-6
+2
-6
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1513,11 +1513,12 @@ | ||
| 1513 | 1513 | ** 4. Number of non-merge children |
| 1514 | 1514 | ** 5. Number of parents |
| 1515 | 1515 | ** 6. mtime |
| 1516 | 1516 | ** 7. branch |
| 1517 | 1517 | */ |
| 1518 | -void print_timeline(Stmt *q, int mxLine, int width, int verboseFlag){ | |
| 1518 | +void print_timeline(Stmt *q, int nLimit, int width, int verboseFlag){ | |
| 1519 | + int nAbsLimit = (nLimit >= 0) ? nLimit : -nLimit; | |
| 1519 | 1520 | int nLine = 0; |
| 1520 | 1521 | int nEntry = 0; |
| 1521 | 1522 | char zPrevDate[20]; |
| 1522 | 1523 | const char *zCurrentUuid=0; |
| 1523 | 1524 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| @@ -1720,15 +1721,10 @@ | ||
| 1720 | 1721 | if( zLimit ){ |
| 1721 | 1722 | n = atoi(zLimit); |
| 1722 | 1723 | }else{ |
| 1723 | 1724 | n = -20; |
| 1724 | 1725 | } |
| 1725 | - if( zWidth ){ | |
| 1726 | - width = atoi(zWidth); | |
| 1727 | - }else{ | |
| 1728 | - width = 80; | |
| 1729 | - } | |
| 1730 | 1726 | if( zWidth ){ |
| 1731 | 1727 | width = atoi(zWidth); |
| 1732 | 1728 | if( (width!=0) && (width<=20) ){ |
| 1733 | 1729 | fossil_fatal("--width|-W value must be >20 or 0"); |
| 1734 | 1730 | } |
| 1735 | 1731 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1513,11 +1513,12 @@ | |
| 1513 | ** 4. Number of non-merge children |
| 1514 | ** 5. Number of parents |
| 1515 | ** 6. mtime |
| 1516 | ** 7. branch |
| 1517 | */ |
| 1518 | void print_timeline(Stmt *q, int mxLine, int width, int verboseFlag){ |
| 1519 | int nLine = 0; |
| 1520 | int nEntry = 0; |
| 1521 | char zPrevDate[20]; |
| 1522 | const char *zCurrentUuid=0; |
| 1523 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| @@ -1720,15 +1721,10 @@ | |
| 1720 | if( zLimit ){ |
| 1721 | n = atoi(zLimit); |
| 1722 | }else{ |
| 1723 | n = -20; |
| 1724 | } |
| 1725 | if( zWidth ){ |
| 1726 | width = atoi(zWidth); |
| 1727 | }else{ |
| 1728 | width = 80; |
| 1729 | } |
| 1730 | if( zWidth ){ |
| 1731 | width = atoi(zWidth); |
| 1732 | if( (width!=0) && (width<=20) ){ |
| 1733 | fossil_fatal("--width|-W value must be >20 or 0"); |
| 1734 | } |
| 1735 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1513,11 +1513,12 @@ | |
| 1513 | ** 4. Number of non-merge children |
| 1514 | ** 5. Number of parents |
| 1515 | ** 6. mtime |
| 1516 | ** 7. branch |
| 1517 | */ |
| 1518 | void print_timeline(Stmt *q, int nLimit, int width, int verboseFlag){ |
| 1519 | int nAbsLimit = (nLimit >= 0) ? nLimit : -nLimit; |
| 1520 | int nLine = 0; |
| 1521 | int nEntry = 0; |
| 1522 | char zPrevDate[20]; |
| 1523 | const char *zCurrentUuid=0; |
| 1524 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| @@ -1720,15 +1721,10 @@ | |
| 1721 | if( zLimit ){ |
| 1722 | n = atoi(zLimit); |
| 1723 | }else{ |
| 1724 | n = -20; |
| 1725 | } |
| 1726 | if( zWidth ){ |
| 1727 | width = atoi(zWidth); |
| 1728 | if( (width!=0) && (width<=20) ){ |
| 1729 | fossil_fatal("--width|-W value must be >20 or 0"); |
| 1730 | } |
| 1731 |