Fossil SCM
Do not make a permanent notation of a merge using --baseline. The --baseline option is really a multi-checkin variation of --cherrypick.
Commit
94c60f3c7ec78de407517cca01468da0c1e15cf3
Parent
f7b4517ca7f51d0…
1 file changed
+1
+1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -108,10 +108,11 @@ | ||
| 108 | 108 | fossil_fatal("not a version: %s", zPivot); |
| 109 | 109 | } |
| 110 | 110 | if( pickFlag ){ |
| 111 | 111 | fossil_fatal("incompatible options: --cherrypick & --baseline"); |
| 112 | 112 | } |
| 113 | + pickFlag = 1; /* Using --baseline is really like doing a cherrypick */ | |
| 113 | 114 | }else if( pickFlag || backoutFlag ){ |
| 114 | 115 | pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid); |
| 115 | 116 | if( pid<=0 ){ |
| 116 | 117 | fossil_fatal("cannot find an ancestor for %s", g.argv[2]); |
| 117 | 118 | } |
| 118 | 119 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -108,10 +108,11 @@ | |
| 108 | fossil_fatal("not a version: %s", zPivot); |
| 109 | } |
| 110 | if( pickFlag ){ |
| 111 | fossil_fatal("incompatible options: --cherrypick & --baseline"); |
| 112 | } |
| 113 | }else if( pickFlag || backoutFlag ){ |
| 114 | pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid); |
| 115 | if( pid<=0 ){ |
| 116 | fossil_fatal("cannot find an ancestor for %s", g.argv[2]); |
| 117 | } |
| 118 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -108,10 +108,11 @@ | |
| 108 | fossil_fatal("not a version: %s", zPivot); |
| 109 | } |
| 110 | if( pickFlag ){ |
| 111 | fossil_fatal("incompatible options: --cherrypick & --baseline"); |
| 112 | } |
| 113 | pickFlag = 1; /* Using --baseline is really like doing a cherrypick */ |
| 114 | }else if( pickFlag || backoutFlag ){ |
| 115 | pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid); |
| 116 | if( pid<=0 ){ |
| 117 | fossil_fatal("cannot find an ancestor for %s", g.argv[2]); |
| 118 | } |
| 119 |