Artifact
bee8c866be0d1820745041873508918b17c5e547:
- File
src/update.c
-
2012-04-06 17:24:26
— part of check-in
[195517a9c9]
on branch trunk
— (1) Show cherrypick and backout merges in the status command
(2) Allow partial commits of cherrypick and backout merges
(3) Prompt user to continue if a check-in comment is unedited
(4) Fixing a jump on uninitialized data on web sbs diff - cherrypick of
[92b2a5c390467a]
(5) Updates against an uncommitted merge are now a warning, not a fatal error.
(user:
drh
size: 24873)
-
2012-04-22 10:09:02
— part of check-in
[40debe4782]
on branch annotate_links
— Merging from trunk.
I solved some conflicts on the report for merges (cherrypick/...), adding some
comments, and adopted the trunk solution to unchanged checkin messages.
(user:
viriketo
size: 24873)
-
2012-08-31 20:46:09
— part of check-in
[c19f34cb69]
on branch trunk
— Revert change [208d67675c]. The policy is to keep the Fossil source code
ASCII even if Fossil itself is able to handle non-ASCII source files.
Furthermore, the [208d67675c] change broken things. Also backout
change [34fcb9634e] since it complicates the C code with unnecessary
backslash characters in order to changes single-quotes to double-quotes
in the generated HTML and Javascript, which is pointless.
(user:
drh
size: 24873)
-
2012-09-04 06:52:04
— part of check-in
[26aa3eeab8]
on branch eclipse-project
— merge trunk
(user:
jan.nijtmans
size: 24873)