Fossil

Check-in [13c7c61ada]
Login

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

Overview
Comment:"fossil update" operates on the local filesystem, so it should have the --case-sensitive option.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 13c7c61ada782f19bdc5e09e799bff7ec4869f08
User & Date: jan.nijtmans 2013-05-24 07:01:20.778
Context
2013-05-24
11:44
Add the "Integrating Fossil in the Microsoft Express 2010 IDE" document from Gilles Ganault. check-in: 33c651cea5 user: drh tags: trunk
07:01
"fossil update" operates on the local filesystem, so it should have the --case-sensitive option. check-in: 13c7c61ada user: jan.nijtmans tags: trunk
2013-05-23
22:36
Fix problems with update and merge when case-sensitive is off and two different checkouts each add files that differ only in case. check-in: a5a8d0477a user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/update.c.
83
84
85
86
87
88
89

90
91
92
93
94
95
96
** prints out what would have happened but does not actually make any
** changes to the current checkout or the repository.
**
** The -v or --verbose option prints status information about unchanged
** files in addition to those file that actually do change.
**
** Options:

**   --debug          print debug information on stdout
**   --latest         acceptable in place of VERSION, update to latest version
**   -n|--dry-run     If given, display instead of run actions
**   -v|--verbose     print status information about all files
**
** See also: revert
*/







>







83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
** prints out what would have happened but does not actually make any
** changes to the current checkout or the repository.
**
** The -v or --verbose option prints status information about unchanged
** files in addition to those file that actually do change.
**
** Options:
**   --case-sensitive <BOOL> override case-sensitive setting
**   --debug          print debug information on stdout
**   --latest         acceptable in place of VERSION, update to latest version
**   -n|--dry-run     If given, display instead of run actions
**   -v|--verbose     print status information about all files
**
** See also: revert
*/
119
120
121
122
123
124
125

126
127
128
129
130
131
132
  dryRunFlag = find_option("dry-run","n",0)!=0;
  if( !dryRunFlag ){
    dryRunFlag = find_option("nochange",0,0)!=0; /* deprecated */
  }
  verboseFlag = find_option("verbose","v",0)!=0;
  debugFlag = find_option("debug",0,0)!=0;
  setmtimeFlag = find_option("setmtime",0,0)!=0;

  db_must_be_within_tree();
  vid = db_lget_int("checkout", 0);
  if( vid==0 ){
    fossil_fatal("cannot find current version");
  }
  if( !dryRunFlag && !internalUpdate ){
    autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);







>







120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
  dryRunFlag = find_option("dry-run","n",0)!=0;
  if( !dryRunFlag ){
    dryRunFlag = find_option("nochange",0,0)!=0; /* deprecated */
  }
  verboseFlag = find_option("verbose","v",0)!=0;
  debugFlag = find_option("debug",0,0)!=0;
  setmtimeFlag = find_option("setmtime",0,0)!=0;
  capture_case_sensitive_option();
  db_must_be_within_tree();
  vid = db_lget_int("checkout", 0);
  if( vid==0 ){
    fossil_fatal("cannot find current version");
  }
  if( !dryRunFlag && !internalUpdate ){
    autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);