Fossil

Check-in [d5649979]
Login

Check-in [d5649979]

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

Overview
Comment:Protect Q-card from having the same UUID as the parent. Example: "fossil merge --cherrypick trunk" followed by "fossil commit --allow-empty"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d5649979ed10dd73ba3eaec02c20be72532f61fa
User & Date: jan.nijtmans 2013-08-27 08:57:54
Context
2013-08-27
13:50
An unused and an uninitialized variable. ... (check-in: 669f22fb user: jan.nijtmans tags: trunk)
12:04
Fix the display of arrows with a private branch as starting point. If UUID's are missing from R-cards (except for the first argument) and Q-cards, this is not fatal: The merge source might be private in some other repository and not (yet) synced. "fossil test-missing" should not report errors for this situation. ... (check-in: 60389c1f user: jan.nijtmans tags: pending-review)
08:57
Protect Q-card from having the same UUID as the parent. Example: "fossil merge --cherrypick trunk" followed by "fossil commit --allow-empty" ... (check-in: d5649979 user: jan.nijtmans tags: trunk)
08:31
Make Notepad the default editor on Cygwin, just as win32, if no other editor is specified. ... (check-in: ad32c20f user: jan.nijtmans tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

︙︙
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041


1042

1043
1044
1045
1046
1047
1048
1049

    }
  }
  db_finalize(&q);
  free(zDate);
  blob_appendf(pOut, "\n");

  db_prepare(&q,
    "SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END || blob.uuid"
    "  FROM vmerge, blob"
    " WHERE (vmerge.id=-1 OR vmerge.id=-2)"
    "   AND blob.rid=vmerge.merge"
    " ORDER BY 1");
  while( db_step(&q)==SQLITE_ROW ){
    const char *zCherrypickUuid = db_column_text(&q, 0);


    blob_appendf(pOut, "Q %s\n", zCherrypickUuid);

  }
  db_finalize(&q);

  if( p->pCksum ) blob_appendf(pOut, "R %b\n", p->pCksum);
  zColor = p->zColor;
  if( p->zBranch && p->zBranch[0] ){
    /* Set tags for the new branch */








|






>
>
|
>








1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052

    }
  }
  db_finalize(&q);
  free(zDate);
  blob_appendf(pOut, "\n");

  db_prepare(&q,
    "SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END || blob.uuid, merge"
    "  FROM vmerge, blob"
    " WHERE (vmerge.id=-1 OR vmerge.id=-2)"
    "   AND blob.rid=vmerge.merge"
    " ORDER BY 1");
  while( db_step(&q)==SQLITE_ROW ){
    const char *zCherrypickUuid = db_column_text(&q, 0);
    int mid = db_column_int(&q, 1);
    if( mid != vid ){
      blob_appendf(pOut, "Q %s\n", zCherrypickUuid);
    }
  }
  db_finalize(&q);

  if( p->pCksum ) blob_appendf(pOut, "R %b\n", p->pCksum);
  zColor = p->zColor;
  if( p->zBranch && p->zBranch[0] ){
    /* Set tags for the new branch */
︙︙