Differences From:

File src/checkin.c part of check-in [f6790b7c3c] - Fix a memory leak that was preventing massive check-ins. by drh on 2009-02-26 01:21:04. [view]

To:

File src/checkin.c part of check-in [8b630bb57a] - Provide --user-override option on the ci command and the --date-override option on the new command. Make a correction to the file format document. by drh on 2009-08-08 22:40:28. [view]

@@ -411,8 +411,9 @@
   int nBasename;         /* Length of "g.zLocalRoot/" */
   const char *zBranch;   /* Create a new branch with this name */
   const char *zBgColor;  /* Set background color when branching */
   const char *zDateOvrd; /* Override date string */
+  const char *zUserOvrd; /* Override user name */
   Blob filename;         /* complete filename */
   Blob manifest;
   Blob muuid;            /* Manifest uuid */
   Blob mcksum;           /* Self-checksum on the manifest */
@@ -425,8 +426,9 @@
   forceFlag = find_option("force", "f", 0)!=0;
   zBranch = find_option("branch","b",1);
   zBgColor = find_option("bgcolor",0,1);
   zDateOvrd = find_option("date-override",0,1);
+  zUserOvrd = find_option("user-override",0,1);
   db_must_be_within_tree();
   noSign = db_get_boolean("omitsign", 0)|noSign;
   if( db_get_boolean("clearsign", 1)==0 ){ noSign = 1; }
   verify_all_options();
@@ -624,9 +626,9 @@
       blob_appendf(&manifest, "T -%F *\n", zTag);
     }
     db_finalize(&q);
   }
-  blob_appendf(&manifest, "U %F\n", g.zLogin);
+  blob_appendf(&manifest, "U %F\n", zUserOvrd ? zUserOvrd : g.zLogin);
   md5sum_blob(&manifest, &mcksum);
   blob_appendf(&manifest, "Z %b\n", &mcksum);
   zManifestFile = mprintf("%smanifest", g.zLocalRoot);
   if( !noSign && clearsign(&manifest, &manifest) ){