Fossil

Check-in [48c00d0b]
Login

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

Overview
Comment:Oops... merge typos fix w/ [bdac9f7238], commited at nearly same time.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:48c00d0bd3ade310d798fbaf7a9ed152d2450748
User & Date: bharder 2008-08-14 05:05:41
Context
2008-08-14
05:27
Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages) check-in: 16e30810 user: bharder tags: trunk
05:05
Oops... merge typos fix w/ [bdac9f7238], commited at nearly same time. check-in: 48c00d0b user: bharder tags: trunk
04:53
fixed typos check-in: 4c78a18a user: bch tags: trunk
04:52
Fix a stupid bug of mine introduced in [3c9e5699ce]. If the ZIP archive's name is composed, the actual project's name should be chosen instead of a fix fossil. check-in: bdac9f72 user: hintze tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

248
249
250
251
252
253
254







255




256
257
258
259
260
261
262
...
327
328
329
330
331
332
333


334

335
336
337
338
339
340
341
...
591
592
593
594
595
596
597


598

599
600
601
602
603
604
605
  if( zEditor==0 ){
    zEditor = getenv("VISUAL");
  }
  if( zEditor==0 ){
    zEditor = getenv("EDITOR");
  }
  if( zEditor==0 ){







    zEditor = "ed";




  }
  zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
                   g.zLocalRoot);
#ifdef __MINGW32__
  blob_add_cr(&text);
#endif
  blob_write_to_file(&text, zFile);
................................................................................
/*
** COMMAND: commit
**
** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
**
** Create a new version containing all of the changes in the current
** checkout.  You will be prompted to enter a check-in comment unless


** the "-m" option is used to specify a command line.  You will be

** prompted for your GPG passphrase in order to sign the new manifest
** unless the "--nosign" options is used.  All files that have
** changed will be committed unless some subset of files is specified
** on the command line.
*/
void commit_cmd(void){
  int rc;
................................................................................
}

/*
** COMMAND: test-import-manifest
**
** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
**


** Create a new version containing containing the specified file

** revisions (if any), and child of the given PARENT version.
*/
void import_manifest_cmd(void){
  const char* zDate;    /* argument - timestamp, as seconds since epoch (int) */
  const char* zComment; /* argument - manifest comment */
  char* zDateFmt;       /* timestamp formatted for the manifest */
  int* zParents;        /* arguments - array of parent references */







>
>
>
>
>
>
>

>
>
>
>







 







>
>
|
>







 







>
>
|
>







248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
...
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
...
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
  if( zEditor==0 ){
    zEditor = getenv("VISUAL");
  }
  if( zEditor==0 ){
    zEditor = getenv("EDITOR");
  }
  if( zEditor==0 ){
#ifdef __MINGW32__
>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
#ifdef __MINGW32__
    zEditor = "notepad";
    zEditor = "notepad";
#else
>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
    zEditor = "ed";
>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
    zEditor = "ed";
#endif
>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
  }
  zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
                   g.zLocalRoot);
#ifdef __MINGW32__
  blob_add_cr(&text);
#endif
  blob_write_to_file(&text, zFile);
................................................................................
/*
** COMMAND: commit
**
** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
**
** Create a new version containing all of the changes in the current
** checkout.  You will be prompted to enter a check-in comment unless
>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
** checkout.  You will be prompted to enter a check-in comment unless
** the "-m" option is used to specify a comment line.  You will be
>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
** prompted for your GPG passphrase in order to sign the new manifest
** unless the "--nosign" options is used.  All files that have
** changed will be committed unless some subset of files is specified
** on the command line.
*/
void commit_cmd(void){
  int rc;
................................................................................
}

/*
** COMMAND: test-import-manifest
**
** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
**
>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
**
** Create a new version containing the specified file
>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
** revisions (if any), and child of the given PARENT version.
*/
void import_manifest_cmd(void){
  const char* zDate;    /* argument - timestamp, as seconds since epoch (int) */
  const char* zComment; /* argument - manifest comment */
  char* zDateFmt;       /* timestamp formatted for the manifest */
  int* zParents;        /* arguments - array of parent references */