Fossil

Check-in [0b8aed94]
Login

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

Overview
Comment:Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:0b8aed945e5caf54c80b5a6fc09709b15a5a5d32
User & Date: drh 2011-01-18 18:36:08
Context
2011-01-18
18:36
Call vfile_check_signature before creating a stash, to make sure that all changed files have been stashed. Ticket [bfef8e4f89cd4b161a584] check-in: a435ae67 user: drh tags: trunk
18:36
Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] check-in: 0b8aed94 user: drh tags: trunk
14:43
Improved hyperlinking in the RSS feed. check-in: 66d93f33 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/update.c.

404
405
406
407
408
409
410
411

412
413
414
415
416
417
418

  /* Report on conflicts
  */
  if( nConflict && !nochangeFlag ){
    if( internalUpdate ){
      internalConflictCnt = nConflict;
    }else{
      printf("WARNING: merge conflicts - see messages above for details.\n");

    }
  }
  
  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( nochangeFlag ){







|
>







404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419

  /* Report on conflicts
  */
  if( nConflict && !nochangeFlag ){
    if( internalUpdate ){
      internalConflictCnt = nConflict;
    }else{
      printf("WARNING: %d merge conflicts - see messages above for details.\n",
              nConflict);
    }
  }
  
  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( nochangeFlag ){