Differences From Artifact [a516b3bdfc]:

• File src/diffcmd.c — part of check-in [f06e492ad8] at 2012-07-14 04:59:33 on branch root-tag — Add the --branch option to the "diff" command, for showing all changes in a particular branch. (user: drh size: 17612)

To Artifact [2fa9b1c34d]:

• File src/diffcmd.c — part of check-in [36134ce275] at 2012-07-14 11:40:12 on branch root-tag — Changes to the root-tag processing to provide better error messages. (user: drh size: 17593) [more...]

513
514
515
516
517
518
519
520
521
522
523
524
525
526
527

  hasNFlag = find_option("new-file","N",0)!=0;
  if( hasNFlag ) diffFlags |= DIFF_NEWFILE;

  if( zBranch ){
    if( zTo || zFrom ){
      fossil_fatal("cannot use --from or --to with --branch");
    }
    zTo = mprintf("tag:%s", zBranch);
    zFrom = mprintf("root:%s", zBranch);
  }
  if( zTo==0 ){
    db_must_be_within_tree();
    verify_all_options();
    if( !isInternDiff ){
      zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);

|

513
514
515
516
517
518
519
520
521
522
523
524
525
526
527

  hasNFlag = find_option("new-file","N",0)!=0;
  if( hasNFlag ) diffFlags |= DIFF_NEWFILE;

  if( zBranch ){
    if( zTo || zFrom ){
      fossil_fatal("cannot use --from or --to with --branch");
    }
    zTo = zBranch;
    zFrom = mprintf("root:%s", zBranch);
  }
  if( zTo==0 ){
    db_must_be_within_tree();
    verify_all_options();
    if( !isInternDiff ){
      zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);