Fossil

Check-in [858940c6]
Login

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

Overview
Comment:Add some explanatory text to the update command to make it easier for new users to learn fossil.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ui-improvements
Files: files | file ages | folders
SHA1:858940c68e5793ae9272c93d7db732a2c2f977a7
User & Date: bcsmith 2010-10-22 01:04:02
Context
2010-10-22
01:06
Merge in some ui enhancements from the ssl_platform_fixes branch. Leaf check-in: 3c19422b user: bcsmith tags: ui-improvements
01:04
Add some explanatory text to the update command to make it easier for new users to learn fossil. check-in: 858940c6 user: bcsmith tags: ui-improvements
2010-10-16
16:24
Do not attempt to parse control artifacts that do not end with a '\n' character. Ticket [be56c89def7f86bcbd] check-in: 7954ccba user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/update.c.

100
101
102
103
104
105
106





107
108

109





110
111
112
113
114
115
116
    if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){
      db_prepare(&q, 
        "%s "
        "   AND event.objid IN leaves"
        " ORDER BY event.mtime DESC",
        timeline_query_for_tty()
      );





      print_timeline(&q, 100);
      db_finalize(&q);

      fossil_fatal("Multiple descendants");





    }
    tid = db_int(0, "SELECT rid FROM leaves, event"
                    " WHERE event.objid=leaves.rid"
                    " ORDER BY event.mtime DESC"); 
  }

  if( tid==vid ) return;  /* Nothing to update */







>
>
>
>
>


>
|
>
>
>
>
>







100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
    if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){
      db_prepare(&q, 
        "%s "
        "   AND event.objid IN leaves"
        " ORDER BY event.mtime DESC",
        timeline_query_for_tty()
      );
      printf(
             "\n"
             "Multiple descendants of the current check-in:"
             "\n\n"
             );
      print_timeline(&q, 100);
      db_finalize(&q);
      printf("\n");
      fossil_fatal(
                   "You must select one branch or leaf.\n"
                   "Select a branch or leaf with 'update VERSION', where 'VERSION' is a UUID\n"
                   "or branch name. Alternatively, you may use 'latest' to refer to the most\n"
                   "recent check-in."
                   );
    }
    tid = db_int(0, "SELECT rid FROM leaves, event"
                    " WHERE event.objid=leaves.rid"
                    " ORDER BY event.mtime DESC"); 
  }

  if( tid==vid ) return;  /* Nothing to update */