Fossil

Check-in [94c60f3c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do not make a permanent notation of a merge using --baseline. The --baseline option is really a multi-checkin variation of --cherrypick.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:94c60f3c7ec78de407517cca01468da0c1e15cf3
User & Date: drh 2011-01-20 19:02:26
Context
2011-01-25
19:03
Update the built-in SQLite to the latest 3.7.5 beta. check-in: 07556099 user: drh tags: trunk
2011-01-20
19:02
Do not make a permanent notation of a merge using --baseline. The --baseline option is really a multi-checkin variation of --cherrypick. check-in: 94c60f3c user: drh tags: trunk
18:54
Add the --baseline option to the "merge" command to facilitate merging of subsections of a branch. check-in: f7b4517c user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge.c.

106
107
108
109
110
111
112

113
114
115
116
117
118
119
    pid = name_to_rid(zPivot);
    if( pid==0 || !is_a_version(pid) ){
      fossil_fatal("not a version: %s", zPivot);
    }
    if( pickFlag ){
      fossil_fatal("incompatible options: --cherrypick & --baseline");
    }

  }else if( pickFlag || backoutFlag ){
    pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid);
    if( pid<=0 ){
      fossil_fatal("cannot find an ancestor for %s", g.argv[2]);
    }
  }else{
    pivot_set_primary(mid);







>







106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
    pid = name_to_rid(zPivot);
    if( pid==0 || !is_a_version(pid) ){
      fossil_fatal("not a version: %s", zPivot);
    }
    if( pickFlag ){
      fossil_fatal("incompatible options: --cherrypick & --baseline");
    }
    pickFlag = 1;  /* Using --baseline is really like doing a cherrypick */
  }else if( pickFlag || backoutFlag ){
    pid = db_int(0, "SELECT pid FROM plink WHERE cid=%d AND isprim", mid);
    if( pid<=0 ){
      fossil_fatal("cannot find an ancestor for %s", g.argv[2]);
    }
  }else{
    pivot_set_primary(mid);