annotate contrib/win32/postinstall.txt @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 766c3c852786
children 259acfb963d1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1289
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 Welcome to Mercurial for Windows!
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 ---------------------------------
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 For configuration and usage directions, please read the ReadMe.html
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 file that comes with this package.
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 Release Notes
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 -------------
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9
2276
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
10 2006-05-10 v0.9
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
11
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
12 * Major changes between Mercurial 0.8.1 and 0.9:
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
13
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
14 - The repository file format has been improved.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
15 - This has resulted in an average 40% reduction in disk space usage.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
16 - The new format (called RevlogNG) is now the default.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
17 - Mercurial works perfectly with both the old and new repository
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
18 file formats. It can transfer changes transparently between
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
19 repositories of either format.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
20 - To use the new repository format, simply use `hg clone --pull` to
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
21 clone an existing repository.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
22 - Note: Versions 0.8.1 and earlier of Mercurial cannot read
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
23 RevlogNG repositories directly, but they can `clone`, `pull`
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
24 from, and `push` to servers that are serving RevlogNG
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
25 repositories.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
26 - Memory usage has been improved by over 50% for many common operations.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
27 - Substantial performance improvements on large repositories.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
28 - New commands:
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
29 - 'archive' - generate a directory tree snapshot, tarball, or zip
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
30 file of a revision
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
31 - Deprecated commands:
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
32 - 'addremove' - replaced by 'add' and 'remove --after'
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
33 - 'forget' - replaced by 'revert'
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
34 - 'undo' - replaced by 'rollback'
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
35 - New extensions:
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
36 - Bugzilla integration hook
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
37 - Email notification hook
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
38 - Nested repositories are now supported. Mercurial will not recurse
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
39 into a subdirectory that contains a '.hg' directory. It is treated
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
40 as a separate repository.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
41 - The standalone web server, 'hg serve', is now threaded, so it can
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
42 talk to multiple clients at a time.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
43 - The web server can now display a "message of the day".
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
44 - Support added for hooks written in Python.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
45 - Many improvements and clarifications to built-in help.
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
46
766c3c852786 Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents: 2216
diff changeset
47
2216
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
48 2006-04-07 v0.8.1
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
49
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
50 * Major changes from 0.8 to 0.8.1:
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
51
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
52 - new extensions:
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
53 mq (manage a queue of patches, like quilt only better)
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
54 email (send changes as series of email patches)
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
55 - new command: merge (replaces "update -m")
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
56 - improved commands: log (--limit option added), pull/push ("-r" works
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
57 on specific revisions), revert (rewritten, much better)
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
58 - comprehensive hook support
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
59 - output templating added, supporting e.g. GNU changelog style
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
60 - Windows, Mac OS X: prebuilt binary packages, better support
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
61 - many reliability, performance, and memory usage improvements
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
62
1cbd10cfcb7c Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents: 1690
diff changeset
63
1690
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
64 2006-01-29 v0.8
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
65
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
66 * Upgrade notes:
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
67
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
68 - diff and status command are now repo-wide by default
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
69 (use 'hg diff .' for the old behavior)
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
70 - GPG signing is now done with the gpg extension
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
71 - the --text option for commit, rawcommit, and tag has been removed
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
72 - the copy/rename --parents option has been removed
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
73
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
74 * Major changes from 0.7 to 0.8:
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
75
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
76 - faster status, diff, and commit
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
77 - reduced memory usage for push and pull
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
78 - improved extension API
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
79 - new bisect, gpg, hgk, and win32text extensions
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
80 - short URLs, binary file handling, and optional gitweb skin for hgweb
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
81 - numerous new command options including log --keyword and pull --rev
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
82 - improved hooks and file filtering
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
83
58894621c87a Update version strings and add release notes to Windows specific files
lcantey@gmail.com
parents: 1305
diff changeset
84
1289
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
85 2005-09-21 v0.7 with modifications
8d24d85ff054 Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
86
1305
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
87 * New INI files have been added to control Mercurial's behaviour:
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
88
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
89 System-wide - C:\Mercurial\Mercurial.ini
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
90 Per-user - C:\Documents and Settings\USERNAME\Mercurial.ini
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
91
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
92 A default version of the system-wide INI file is installed with
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
93 Mercurial. No per-user INI file is installed, but it will be
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
94 honoured if you create one.
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
95
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
96 * Windows line endings are now handled automatically and correctly by
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
97 the update and commit commands. See the INI file for how to
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
98 customise this behaviour.
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
99
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
100 * NOTE: Much of the rest of the Mercurial code does not handle Windows
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
101 line endings properly. Accordingly, the output of the diff command,
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
102 for example, will appear huge until I fix this.
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
103
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
104 * Packaged text files now have correct Windows line endings.
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
105
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
106
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
107 2005-09-21 v0.7 with modifications
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
108
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
109 * This is the first standalone release of Mercurial for Windows.
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
110
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
111 * I believe it to be mostly functional, with one exception: there is
d4a555646460 Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1289
diff changeset
112 no support yet for DOS <-> Unix line ending conversion.