Fossil: Check-in [bf079432]

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

Overview

Comment:	Make merges a no-op if the pivot is the same as the version being merged.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	bf079432fb2ecc14ce07fb73f02a9450c2d98cfc
User & Date:	drh 2012-08-27 22:56:24

References

2012-08-29
20:57		undo [bf079432fb]: It's crucial for the Tcl fossil repository to be able to do a no-op merge-mark. This change would make that impossible. (Closed-Leaf check-in: 41577fd3 user: jan.nijtmans tags: broken-msvc-2)

Context

2012-08-28
17:39		Fixes to hyperlink generation for embedded documentation. (check-in: ed6adcaf user: drh tags: trunk)
09:05		merge trunk into ticket-01a2f3a346 branch (check-in: f89bd067 user: jan.nijtmans tags: ticket-01a2f3a346)
06:24		This change allows html entities (like → and •) in all c-sources to be replaced by its utf-8 equivalent (→,•). The translate utility will translate this to the right escape-sequence, so the C-compiler can handle it. As long as the C-source doesn't contain any utf-8 characters, this generates exactly the same *_.c files as before. (check-in: b5e2e500 user: jan.nijtmans tags: utf8-in-sources)
2012-08-27
22:56		Make merges a no-op if the pivot is the same as the version being merged. (check-in: bf079432 user: drh tags: trunk)
21:09		Include branch information in the output of the finfo command. Patches from Peter Spjuth. (check-in: 724bf68a user: drh tags: trunk)

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge.c.

  if( backoutFlag ){
    int t = pid;
    pid = mid;
    mid = t;
  }
  if( !is_a_version(pid) ){
    fossil_fatal("not a version: record #%d", pid);




  }
  if( detailFlag ){
    print_checkin_description(mid, 12, "merge-from:");
    print_checkin_description(pid, 12, "baseline:");
  }
  vfile_check_signature(vid, 1, 0);
  db_begin_transaction();








>
>
>
>

  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();