Fossil

Check-in [fee3c676]
Login

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

Overview
Comment:Merge latest trunk into symlinks branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | symlinks
Files: files | file ages | folders
SHA1:fee3c6767df719ee4239fe6b50f07903ce75d168
User & Date: dmitry 2011-09-02 12:27:03
Context
2011-09-08
11:52
Merge latest trunk into symlinks branch. check-in: 981e5c62 user: dmitry tags: symlinks
2011-09-02
12:39
Merge symlink fixes into trunk. check-in: c97535c5 user: dmitry tags: trunk
12:27
Merge latest trunk into symlinks branch. check-in: fee3c676 user: dmitry tags: symlinks
12:18
Merge the latest autosetup changes into trunk. check-in: 172580e0 user: drh tags: trunk
10:34
Print description of conflict when 'stash apply' cannot merge a symlink and a regular file. check-in: bca6924e user: dmitry tags: symlinks
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to autosetup/cc.tcl.

329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349

# Similar to cc-add-settings, but each given setting
# simply replaces the existing value.
#
# Returns the previous settings
proc cc-update-settings {args} {
	set prev [cc-get-settings]
	array set new $prev

	foreach {name value} $args {
		set new($name) $value
	}
	cc-store-settings $new

	return $prev
}

# @cc-with settings ?{ script }?
#
# Sets the given 'cctest' settings and then runs the tests in 'script'.
# Note that settings such as -lang replace the current setting, while







<
<
<
<
<
|
<







329
330
331
332
333
334
335





336

337
338
339
340
341
342
343

# Similar to cc-add-settings, but each given setting
# simply replaces the existing value.
#
# Returns the previous settings
proc cc-update-settings {args} {
	set prev [cc-get-settings]





	cc-store-settings [dict merge $prev $args]

	return $prev
}

# @cc-with settings ?{ script }?
#
# Sets the given 'cctest' settings and then runs the tests in 'script'.
# Note that settings such as -lang replace the current setting, while