Fossil

Check-in [41577fd3]
Login

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

Overview
Comment: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.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | broken-msvc-2
Files: files | file ages | folders
SHA1:41577fd3ef8cd65d0e68d2cf28134c148f382955
User & Date: jan.nijtmans 2012-08-29 20:57:33
Context
2012-08-29
21:32
upgrade to dirent-1.11 Closed-Leaf check-in: 10fec4b7 user: jan.nijtmans tags: broken-msvc-2, dirent-1.11
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
20:48
working part of [ticket-01a2f3a346] (still don't understand, but somehow it doesn't work with msvc) check-in: 51730940 user: jan.nijtmans tags: broken-msvc-2
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge.c.

174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
    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();
  if( !nochangeFlag ) undo_begin();







<
<
<
<







174
175
176
177
178
179
180




181
182
183
184
185
186
187
    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( !nochangeFlag ) undo_begin();