Fossil

Differences From Artifact [e2b8e0bdff]:

• File src/merge3.c — part of check-in [cbd24a2594] at 2024-12-03 19:20:14 on branch merge-enhancements — The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT data. Incremental check-in. (user: drh size: 34139) [more...]

To Artifact [cc1b2af132]:

• File src/merge3.c — part of check-in [d6fa91fdc8] at 2024-12-04 18:57:47 on branch trunk — Bug fix in the previous check-in for the "--tk" option on the "3-way-merge" command. (user: drh size: 34179)

809
810
811
812
813
814
815

816
817
818
819
820
821
822
823
824

  if( zCnt==0 ){
    nContext = 6;
  }else{
    nContext = atoi(zCnt);
    if( nContext<0 ) nContext = 0xfffffff;
  }
  blob_zero(&script);

  blob_appendf(&script, "set fossilcmd {| \"%/\" %s -tcl -c %d",
               g.nameOfExe, zSubCmd, nContext);
  find_option("tcl",0,0);
  find_option("debug",0,0);
  zTclsh = find_option("tclsh",0,1);
  if( zTclsh==0 ){
    zTclsh = db_get("tclsh",0);
  }
  /* The undocumented --script FILENAME option causes the Tk script to

>
|
|

809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825

  if( zCnt==0 ){
    nContext = 6;
  }else{
    nContext = atoi(zCnt);
    if( nContext<0 ) nContext = 0xfffffff;
  }
  blob_zero(&script);
  blob_appendf(&script, "set ncontext %d\n", nContext);
  blob_appendf(&script, "set fossilcmd {| \"%/\" %s -tcl",
               g.nameOfExe, zSubCmd);
  find_option("tcl",0,0);
  find_option("debug",0,0);
  zTclsh = find_option("tclsh",0,1);
  if( zTclsh==0 ){
    zTclsh = db_get("tclsh",0);
  }
  /* The undocumented --script FILENAME option causes the Tk script to