Comment:	merge branch-1.28, a few other cherry-picks from trunk
Downloads:	Tarball | ZIP archive | SQL archive
Timelines:	family | ancestors | descendants | both | win32-longpath
Files:	files | file ages | folders
SHA1:	303e7af7c31866cf066532b0d8d20e202ea4a75f
User & Date:	jan.nijtmans 2014-01-23 21:18:30

2014-01-23
21:47		merge trunk ... (check-in: abb24004 user: jan.nijtmans tags: win32-longpath)
21:18		merge branch-1.28, a few other cherry-picks from trunk ... (check-in: 303e7af7 user: jan.nijtmans tags: win32-longpath)
2014-01-18
13:49		Skip merge-utf-*.23 and merge-utf-*.32 test-cases, which currently fail. They are not crucial for the 1.28 release (in Fossil 1.26 and 1.27 they failed as well). Probably a problem in the test-case itself (some special character in test/utf.test?) ... (check-in: 4b3b89b5 user: jan.nijtmans tags: branch-1.28)
2014-01-17
13:35		Tree-view expand/collapse enhancements. Press "Reload" after upgraded in order to reload CSS. ... (check-in: 0647dd38 user: drh tags: trunk)
2014-01-16
21:59		Further fixes for tree-view in ancient versions of Firefox. ... (check-in: f69dbc36 user: drh tags: trunk)
2014-01-15
11:43		Avoid unnecessary no-op write transactions on the server during a pull. ... (check-in: b4dffdac user: drh tags: trunk)
2013-12-30
20:57		merge trunk ... (check-in: 02a0e889 user: jan.nijtmans tags: win32-longpath)

Changes to auto.def.

Changes to src/add.c.

Changes to src/attach.c.

Changes to src/browse.c.

Changes to src/checkin.c.

Changes to src/db.c.

Changes to src/diff.c.

Changes to src/file.c.

Changes to src/finfo.c.

Changes to src/info.c.

Changes to src/main.c.

Changes to src/main.mk.

Changes to src/makemake.tcl.

Changes to src/manifest.c.

Changes to src/merge.c.

Changes to src/name.c.

Changes to src/rebuild.c.

Changes to src/report.c.

Changes to src/search.c.

Changes to src/setup.c.

Changes to src/shell.c.

Changes to src/skins.c.

Changes to src/sqlite3.c.

Changes to src/sqlite3.h.

Changes to src/style.c.

Changes to src/th.c.

Changes to src/th.h.

Changes to src/th_lang.c.

Changes to src/th_main.c.

Changes to src/timeline.c.

Changes to src/tkt.c.

Changes to src/update.c.

Changes to src/user.c.

Changes to src/winfile.c.

Changes to src/xfer.c.

Changes to test/merge2.test.

Changes to test/th1.test.

Changes to win/Makefile.PellesCGMake.

Changes to win/Makefile.dmc.

Changes to win/Makefile.mingw.

Changes to win/Makefile.mingw.mistachkin.

Changes to win/Makefile.msc.

Changes to www/build.wiki.

Changes to www/changes.wiki.

Changes to www/makefile.wiki.