Differences From Artifact [94e523df0b]:

• File src/branch.c — part of check-in [59ddd3c8ae] at 2011-05-06 16:55:07 on branch windows-i18n — Merge the latest trunk changes into windows-i18n branch. (user: drh size: 11577) [more...]

To Artifact [e1b5203400]:

• File src/branch.c — part of check-in [2a013f0228] at 2011-06-01 22:32:29 on branch trunk — In contexts where only a check-out makes since, only resolve tags or branch names into check-outs, not events or other artifacts. Ticket [5f611295e3c2a8]. (user: drh size: 11589) [more...]

66
67
68
69
70
71
72
73
74
75
76
77
78
79
80

        "   AND tagid=(SELECT tagid FROM tag WHERE tagname='sym-%s')",
        zBranch)!=0 ){
    fossil_fatal("branch \"%s\" already exists", zBranch);
  }

  user_select();
  db_begin_transaction();
  rootid = name_to_rid(g.argv[4]);
  if( rootid==0 ){
    fossil_fatal("unable to locate check-in off of which to branch");
  }

  pParent = manifest_get(rootid, CFTYPE_MANIFEST);
  if( pParent==0 ){
    fossil_fatal("%s is not a valid check-in", g.argv[4]);

|

66
67
68
69
70
71
72
73
74
75
76
77
78
79
80

        "   AND tagid=(SELECT tagid FROM tag WHERE tagname='sym-%s')",
        zBranch)!=0 ){
    fossil_fatal("branch \"%s\" already exists", zBranch);
  }

  user_select();
  db_begin_transaction();
  rootid = name_to_typed_rid(g.argv[4], "ci");
  if( rootid==0 ){
    fossil_fatal("unable to locate check-in off of which to branch");
  }

  pParent = manifest_get(rootid, CFTYPE_MANIFEST);
  if( pParent==0 ){
    fossil_fatal("%s is not a valid check-in", g.argv[4]);