Fossil

    }else if( nParent>1 ){
      zPrefix = "*MERGE* ";
    }else if( nChild>1 ){
      zPrefix = "*FORK* ";
    }

    @     <item>
    @       <title>%s(zPrefix)%h(zCom)</title>
    @       <link>%s(g.zBaseURL)/ci/%s(zId)</link>
    @       <description>%s(zPrefix)%h(zCom)</description>
    @       <pubDate>%s(zDate)</pubDate>
    @       <author>%h(zAuthor)</author>
    @       <guid>%s(g.zBaseURL)/ci/%s(zId)</guid>
    @     </item>
    free(zDate);

@        puts "Logged in as $login"
@      } else {
@        puts "Not logged in"
@      }
@   </th1></nobr></div>
@ </div>
@ <div class="mainmenu"><th1>
@ html "<a href="$baseurl$index_page">Home</a> "
@ if {[anycap jor]} {
@   html "<a href="$baseurl/timeline">Timeline</a> "
@ }
@ if {[hascap oh]} {
@   html "<a href="$baseurl/dir">Files</a> "
@ }
@ if {[hascap o]} {
@   html "<a href="$baseurl/leaves">Leaves</a> "
@   html "<a href="$baseurl/brlist">Branches</a> "
@   html "<a href="$baseurl/taglist">Tags</a> "
@ }
@ if {[hascap r]} {
@   html "<a href="$baseurl/reportlist">Tickets</a> "
@ }
@ if {[hascap j]} {
@   html "<a href="$baseurl/wiki">Wiki</a> "
@ }
@ if {[hascap s]} {
@   html "<a href="$baseurl/setup">Admin</a> "
@ } elseif {[hascap a]} {
@   html "<a href="$baseurl/setup_ulist">Users</a> "
@ }
@ if {[info exists login]} {
@   html "<a href="$baseurl/login">Logout</a> "
@ } else {
@   html "<a href="$baseurl/login">Login</a> "
@ }
@ </th1></div>
@ ');
@ REPLACE INTO config VALUES('footer','<div class="footer">
@ Fossil version $manifest_version $manifest_date 
@ </div>
@ </body></html>

@        puts "Logged in as $login"
@      } else {
@        puts "Not logged in"
@      }
@   </th1></nobr></div>
@ </div>
@ <div class="mainmenu"><th1>
@ html "<a href="$baseurl$index_page">Home</a> "
@ if {[anycap jor]} {
@   html "<a href="$baseurl/timeline">Timeline</a> "
@ }
@ if {[hascap oh]} {
@   html "<a href="$baseurl/dir">Files</a> "
@ }
@ if {[hascap o]} {
@   html "<a href="$baseurl/leaves">Leaves</a> "
@   html "<a href="$baseurl/brlist">Branches</a> "
@   html "<a href="$baseurl/taglist">Tags</a> "
@ }
@ if {[hascap r]} {
@   html "<a href="$baseurl/reportlist">Tickets</a> "
@ }
@ if {[hascap j]} {
@   html "<a href="$baseurl/wiki">Wiki</a> "
@ }
@ if {[hascap s]} {
@   html "<a href="$baseurl/setup">Admin</a> "
@ } elseif {[hascap a]} {
@   html "<a href="$baseurl/setup_ulist">Users</a> "
@ }
@ if {[info exists login]} {
@   html "<a href="$baseurl/login">Logout</a> "
@ } else {
@   html "<a href="$baseurl/login">Login</a> "
@ }
@ </th1></div>
@ ');
@ REPLACE INTO config VALUES('footer','<div class="footer">
@ Fossil version $manifest_version $manifest_date
@ </div>
@ </body></html>

@   text-decoration: none;
@ }
@ div.mainmenu a:hover {
@   color: #eee;
@   background-color: #333;
@ }
@ 
@ /* Container for the sub-menu and content so they don"t spread
@ ** out underneath the main menu */
@ #container {
@   padding-left: 9em;
@ }
@ 
@ /* The submenu bar that *sometimes* appears below the main menu */
@ div.submenu {

@        puts "Logged in as $login"
@      } else {
@        puts "Not logged in"
@      }
@   </th1></nobr></div>
@ </div>
@ <div class="mainmenu"><ul><th1>
@ html "<li><a href="$baseurl$index_page">Home</a></li>"
@ if {[anycap jor]} {
@   html "<li><a href="$baseurl/timeline">Timeline</a></li>"
@ }
@ if {[hascap oh]} {
@   html "<li><a href="$baseurl/dir">Files</a></li>"
@ }
@ if {[hascap o]} {
@   html "<li><a href="$baseurl/leaves">Leaves</a></li>"
@   html "<li><a href="$baseurl/brlist">Branches</a></li>"
@   html "<li><a href="$baseurl/taglist">Tags</a></li>"
@ }
@ if {[hascap r]} {
@   html "<li><a href="$baseurl/reportlist">Tickets</a></li>"
@ }
@ if {[hascap j]} {
@   html "<li><a href="$baseurl/wiki">Wiki</a></li>"
@ }
@ if {[hascap s]} {
@   html "<li><a href="$baseurl/setup">Admin</a></li>"
@ } elseif {[hascap a]} {
@   html "<li><a href="$baseurl/setup_ulist">Users</a></li>"
@ }
@ if {[info exists login]} {
@   html "<li><a href="$baseurl/login">Logout</a></li>"
@ } else {
@   html "<li><a href="$baseurl/login">Login</a></li>"
@ }
@ </th1></ul></div>
@ <div id="container">
@ ');
@ REPLACE INTO config VALUES('footer','</div>
@ <div class="footer">
@ Fossil version $manifest_version $manifest_date

**
** See also: [sqlite3_libversion()],
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
#define SQLITE_VERSION        "3.6.23"
#define SQLITE_VERSION_NUMBER 3006023
#define SQLITE_SOURCE_ID      "2010-03-05 13:53:23 27413fc8dd52b754b4be9344a66bb9e0d752d48e"

/*
** CAPI3REF: Run-Time Library Version Numbers
** KEYWORDS: sqlite3_version, sqlite3_sourceid
**
** These interfaces provide the same information as the [SQLITE_VERSION],
** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros

# include <sys/ioctl.h>
# if OS_VXWORKS
#  include <semaphore.h>
#  include <limits.h>
# else
#  include <sys/file.h>
#  include <sys/param.h>

# endif
#endif /* SQLITE_ENABLE_LOCKING_STYLE */

#if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
# include <sys/mount.h>
#endif

/*
** Allowed values of unixFile.fsFlags
*/
#define SQLITE_FSFLAGS_IS_MSDOS     0x1

/*

**
** See also: [sqlite3_libversion()],
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
#define SQLITE_VERSION        "3.6.23"
#define SQLITE_VERSION_NUMBER 3006023
#define SQLITE_SOURCE_ID      "2010-03-05 13:53:23 27413fc8dd52b754b4be9344a66bb9e0d752d48e"

/*
** CAPI3REF: Run-Time Library Version Numbers
** KEYWORDS: sqlite3_version, sqlite3_sourceid
**
** These interfaces provide the same information as the [SQLITE_VERSION],
** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros

  }
  url_parse(zUrl);
  if( !g.dontKeepUrl ){
    db_set("last-sync-url", g.urlCanonical, 0);
    if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0);
  }
  if( g.urlUser!=0 && g.urlPasswd==0 ){
    if( zPw==0 ){
      url_prompt_for_password();
    }else{
      g.urlPasswd = mprintf("%s", zPw);
    }
  }
  user_select();
  if( g.argc==2 ){
    printf("Server:    %s\n", g.urlCanonical);
  }
  url_enable_proxy("via proxy: ");
}

    if( zAfter==0 && zBefore==0 && zCirca==0 ){
      blob_appendf(&desc, "%d most recent %ss", n, zEType);
    }else{
      blob_appendf(&desc, "%d %ss", n, zEType);
    }
    if( zUser ){
      blob_appendf(&desc, " by user %h", zUser);
      tmFlags |= TIMELINE_DISJOINT;
    }
    if( tagid>0 ){
      blob_appendf(&desc, " tagged with \"%h\"", zTagName);
      tmFlags |= TIMELINE_DISJOINT;
    }
    if( zAfter ){
      blob_appendf(&desc, " occurring on or after %h.<br>", zAfter);

    db_multi_exec(blob_str(&sql));
    blob_reset(&sql);
  }

  db_prepare(&q, 
    "SELECT fn, idv, ridv, idt, ridt, chnged FROM fv ORDER BY 1"
  );
  assert( g.zLocalRoot!=0 );
  assert( strlen(g.zLocalRoot)>1 );
  assert( g.zLocalRoot[strlen(g.zLocalRoot)-1]=='/' );
  while( db_step(&q)==SQLITE_ROW ){
    const char *zName = db_column_text(&q, 0);  /* The filename from root */
    int idv = db_column_int(&q, 1);             /* VFILE entry for current */
    int ridv = db_column_int(&q, 2);            /* RecordID for current */
    int idt = db_column_int(&q, 3);             /* VFILE entry for target */
    int ridt = db_column_int(&q, 4);            /* RecordID for target */
    int chnged = db_column_int(&q, 5);          /* Current is edited */
    char *zFullPath;                            /* Full pathname of the file */

    zFullPath = mprintf("%s%s", g.zLocalRoot, zName);
    if( idv>0 && ridv==0 && idt>0 && ridt>0 ){
      /* Conflict.  This file has been added to the current checkout
      ** but also exists in the target checkout.  Use the current version.
      */
      printf("CONFLICT %s\n", zName);
    }else if( idt>0 && idv==0 ){
      /* File added in the target. */
      printf("ADD %s\n", zName);

      ** the error card on the first message of a clone.
      */        
      if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
        if( !cloneFlag || nCycle>0 ){
          char *zMsg = blob_terminate(&xfer.aToken[1]);
          defossilize(zMsg);
          if( strcmp(zMsg, "login failed")==0 ){
            if( nCycle<2 ){
              if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0);

              go = 1;
            }
          }else{
            blob_appendf(&xfer.err, "\rserver says: %s", zMsg);
          }
          fossil_fatal("\rError: %s", zMsg);
        }
      }else

      /* Unknown message */
      {
        if( blob_str(&xfer.aToken[0])[0]=='<' ){
          fossil_fatal(