Fossil

Check-in [7847b418bb]
Login

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

Overview
Comment:Improvements to the way the update target is computed when saying "fossil update" without specifying what to update to. Avoid the "bad object id: 0" error.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7847b418bb514bd8f63784aeddcb1647693ef045
User & Date: drh 2009-08-14 14:00:10.000
Context
2009-08-14
14:03
Fix the header comment (and hence the "help" message) for the "fossil all" command. check-in: 0b49e4afba user: drh tags: trunk
14:00
Improvements to the way the update target is computed when saying "fossil update" without specifying what to update to. Avoid the "bad object id: 0" error. check-in: 7847b418bb user: drh tags: trunk
2009-08-13
14:36
In the "remote-url" command, omit the userid and password from the URL unless the "--show-pw" command-line option is used. check-in: 9cbef7a104 user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/descendants.c.
77
78
79
80
81
82
83
84




85









86
87
88
89
90
91
92
  }

  /* Initialize the bags. */
  bag_init(&seen);
  bag_init(&pending);
  bag_insert(&pending, iBase);

  /* This query returns all non-merge children of check-in :rid */




  db_prepare(&q1, "SELECT cid FROM plink WHERE pid=:rid AND isprim");










  /* This query returns a single row if check-in :rid is the first
  ** check-in of a new branch.
  */
  db_prepare(&isBr, 
     "SELECT 1 FROM tagxref"
     " WHERE rid=:rid AND tagid=%d AND tagtype=2"







|
>
>
>
>
|
>
>
>
>
>
>
>
>
>







77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
  }

  /* Initialize the bags. */
  bag_init(&seen);
  bag_init(&pending);
  bag_insert(&pending, iBase);

  /* This query returns all non-branch-merge children of check-in :rid.
  **
  ** If a a child is a merge of a fork within the same branch, it is 
  ** returned.  Only merge children in different branches are excluded.
  */
  db_prepare(&q1,
    "SELECT cid FROM plink"
    " WHERE pid=:rid"
    "   AND (isprim"
    "        OR coalesce((SELECT value FROM tagxref"
                      "   WHERE tagid=%d AND rid=plink.pid), 'trunk')"
               "=coalesce((SELECT value FROM tagxref"
                      "   WHERE tagid=%d AND rid=plink.cid), 'trunk'))",
    TAG_BRANCH, TAG_BRANCH
  );

  /* This query returns a single row if check-in :rid is the first
  ** check-in of a new branch.
  */
  db_prepare(&isBr, 
     "SELECT 1 FROM tagxref"
     " WHERE rid=:rid AND tagid=%d AND tagtype=2"