Differences From Artifact [898006906c]:

• File src/update.c — part of check-in [d4d739898d] at 2021-12-27 12:02:54 on branch binary_merge_conflict_fix — improve warning message for binary merge conflict on update. (user: mgagnon size: 34476) [more...]

To Artifact [1f8c3feada]:

• File src/update.c — part of check-in [07ed3fedfa] at 2022-02-17 02:38:26 on branch trunk — 'update' now lists the updated-from version, per off-list user request, the intent being to simplify access to the version for purposes of running a diff after seeing updates arrive. (user: stephan size: 34540)

554
555
556
557
558
559
560
561
562
563
564
565


566
567
568
569
570
571
572

554
555
556
557
558
559
560

561
562
563
564
565
566
567
568
569
570
571
572
573

-




+
+

      }
    }
    free(zFullPath);
    free(zFullNewPath);
  }
  db_finalize(&q);
  db_finalize(&mtimeXfer);
  fossil_print("%.79c\n",'-');
  if( nUpdate==0 ){
    show_common_info(tid, "checkout:", 1, 0);
    fossil_print("%-13s None. Already up-to-date\n", "changes:");
  }else{
    fossil_print("%.79c\n%-13s %z\n",'-', "updated-from:",
                 rid_to_uuid(vid));
    show_common_info(tid, "updated-to:", 1, 0);
    fossil_print("%-13s %d file%s modified.\n", "changes:",
                 nUpdate, nUpdate>1 ? "s" : "");
  }

  /* Report on conflicts
  */