Differences From Artifact [97116104e7]:

• File src/merge.c — part of check-in [9c28bca430] at 2012-02-10 23:37:14 on branch trunk — Record --backout and --cherrypick merges in the VMERGE table with IDs -2 and -1, respectively. On a --cherrypick merge, make the default check-in comment be the same as the check-in comment for the cherrypicked change. (user: drh size: 19307) [more...]

To Artifact [9178965411]:

• File src/merge.c — part of check-in [bf079432fb] at 2012-08-27 22:56:24 on branch trunk — Make merges a no-op if the pivot is the same as the version being merged. (user: drh size: 19387) [more...]

173
174
175
176
177
178
179




180
181
182
183
184
185
186

173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190

+
+
+
+

  if( backoutFlag ){
    int t = pid;
    pid = mid;
    mid = t;
  }
  if( !is_a_version(pid) ){
    fossil_fatal("not a version: record #%d", pid);
  }
  if( mid==pid ){
    fossil_print("This merge is a no-op.\n");
    return;
  }
  if( detailFlag ){
    print_checkin_description(mid, 12, "merge-from:");
    print_checkin_description(pid, 12, "baseline:");
  }
  vfile_check_signature(vid, 1, 0);
  db_begin_transaction();