Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merged updates from trunk. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | bad-winsymlink |
Files: | files | file ages | folders |
SHA1: |
e2c5960617f2c9d1b10386e7bf945db8 |
User & Date: | sdr 2014-09-20 15:28:36 |
Original Comment: | Merged with trunk. |
Context
2014-09-20
| ||
16:50 | Fixed a problem with the high level symlink creation code to accommodate windows drive letters. Also modified windows symlink creation logic to better handle dir/file symlinks. check-in: 1f1f75066a user: sdr tags: bad-winsymlink | |
15:28 | Merged updates from trunk. check-in: e2c5960617 user: sdr tags: bad-winsymlink | |
14:49 | Solaris 10 build patch from Freddy Dissaux. check-in: 4fcbd9b09f user: stephan tags: trunk | |
2014-09-15
| ||
01:49 | Work in progress for windows symlink support. check-in: de8035cca6 user: sdr tags: winsymlink | |
Changes
Changes to src/checkin.c.
︙ | ︙ | |||
471 472 473 474 475 476 477 | int showHdr = find_option("header",0,0)!=0; int cwdRelative = 0; Glob *pIgnore; Blob rewrittenPathname; const char *zPathname, *zDisplayName; if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; | < | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | int showHdr = find_option("header",0,0)!=0; int cwdRelative = 0; Glob *pIgnore; Blob rewrittenPathname; const char *zPathname, *zDisplayName; if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; db_must_be_within_tree(); cwdRelative = determine_cwd_relative_option(); /* We should be done with options.. */ verify_all_options(); if( zIgnoreFlag==0 ){ |
︙ | ︙ | |||
594 595 596 597 598 599 600 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; zIgnoreFlag = find_option("ignore",0,1); verboseFlag = find_option("verbose","v",0)!=0; zKeepFlag = find_option("keep",0,1); zCleanFlag = find_option("clean",0,1); | < | 593 594 595 596 597 598 599 600 601 602 603 604 605 606 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; zIgnoreFlag = find_option("ignore",0,1); verboseFlag = find_option("verbose","v",0)!=0; zKeepFlag = find_option("keep",0,1); zCleanFlag = find_option("clean",0,1); db_must_be_within_tree(); if( zIgnoreFlag==0 ){ zIgnoreFlag = db_get("ignore-glob", 0); } if( zKeepFlag==0 ){ zKeepFlag = db_get("keep-glob", 0); } |
︙ | ︙ |
Changes to src/file.c.
︙ | ︙ | |||
1108 1109 1110 1111 1112 1113 1114 | ** a boolean: "yes", "no", "true", "false", etc. */ void cmd_test_tree_name(void){ int i; Blob x; db_find_and_open_repository(0,0); blob_zero(&x); | < | 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 | ** a boolean: "yes", "no", "true", "false", etc. */ void cmd_test_tree_name(void){ int i; Blob x; db_find_and_open_repository(0,0); blob_zero(&x); for(i=2; i<g.argc; i++){ if( file_tree_name(g.argv[i], &x, 1) ){ fossil_print("%s\n", blob_buffer(&x)); blob_reset(&x); } } } |
︙ | ︙ |