Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/win32/ReadMe.html @ 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 | 280fde4b8701 |
children | 259acfb963d1 |
rev | line source |
---|---|
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
2 <html> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
3 <head> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
4 <title>Mercurial for Windows</title> |
2091
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
5 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
6 <style type="text/css"> |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
7 <!-- |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
8 .indented |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
9 { |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
10 padding-left: 10pt; |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
11 } |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
12 --> |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
13 </style> |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
14 </head> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
16 <body> |
2276
766c3c852786
Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents:
2216
diff
changeset
|
17 <h1>Mercurial version 0.9 for Windows</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
19 <p>Welcome to Mercurial for Windows!</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
21 <p>Mercurial is a command-line application. You must run it from |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
22 the Windows command prompt (or if you're hard core, a <a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
23 href="http://www.mingw.org/">MinGW</a> shell).</p> |
2091
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
24 |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
25 <p><div class="indented"><i>Note: the standard <a |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
26 href="http://www.mingw.org/">MinGW</a> msys startup script uses |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
27 rxvt which has problems setting up standard input and output. |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
28 Running bash directly works correctly.</i></div> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
29 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
30 <p>For documentation, please visit the <a |
2091
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
31 href="http://www.selenic.com/mercurial">Mercurial web site</a>.</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
32 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
33 <p>By default, Mercurial installs to <tt>C:\Mercurial</tt>. The |
2384
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
34 Mercurial command is called <tt>hg.exe</tt>.</p> |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
35 |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
36 <h1>Testing Mercurial after you've installed it</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
37 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
38 <p>The easiest way to check that Mercurial is installed properly is to |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
39 just type the following at the command prompt:</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
40 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
41 <pre> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
42 hg |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
43 </pre> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
44 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
45 <p>This command should print a useful help message. If it does, |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
46 other Mercurial commands should work fine for you.</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
47 |
2307
5b3a3e35f084
Add section for configuration notes with initial note about the default editor
Lee Cantey <lcantey@gmail.com>
parents:
2276
diff
changeset
|
48 <h1>Configuration notes</h1> |
2321
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
49 <p>The default editor for commit messages is 'vi'. You can set the EDITOR |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
50 (or HGEDITOR) environment variable to specify your preference or set it in |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
51 mercurial.ini:</p> |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
52 <pre> |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
53 [ui] |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
54 editor = whatever |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
55 </pre> |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
56 |
2307
5b3a3e35f084
Add section for configuration notes with initial note about the default editor
Lee Cantey <lcantey@gmail.com>
parents:
2276
diff
changeset
|
57 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
58 <h1>Reporting problems</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
59 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
60 <p>Before you report any problems, please consult the <a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
61 href="http://www.selenic.com/mercurial">Mercurial web site</a> and |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
62 see if your question is already in our list of <a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
63 href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
64 Answered Questions</a> (the "FAQ"). |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
65 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
66 <p>If you cannot find an answer to your question, please feel |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
67 free to send mail to the Mercurial mailing list, at <a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
68 href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>. |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
69 <b>Remember</b>, the more useful information you include in your |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
70 report, the easier it will be for us to help you!</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
71 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
72 <p>If you are IRC-savvy, that's usually the fastest way to get |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
73 help. Go to <tt>#mercurial</tt> on |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
74 <tt>irc.freenode.net</tt>.</p> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
75 |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
76 <h1>Author and copyright information</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
77 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
78 <p>Mercurial was written by <a href="http://www.selenic.com">Matt |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
79 Mackall</a>, and is maintained by Matt and a team of |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
80 volunteers.</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
81 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
82 <p>The Windows installer was written by <a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
83 href="http://www.serpentine.com/blog">Bryan |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
84 O'Sullivan</a>.</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
85 |
2216
1cbd10cfcb7c
Update release notes and copyright year for Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
2091
diff
changeset
|
86 <p>Mercurial is Copyright 2005, 2006 Matt Mackall and others. See the |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
87 <tt>Contributors.txt</tt> file for a list of contributors.</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
88 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
89 <p>Mercurial is free software; you can redistribute it and/or |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
90 modify it under the terms of the <a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
91 href="http://www.gnu.org/copyleft/gpl.html">GNU General Public |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
92 License</a> as published by the Free Software Foundation; either |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
93 version 2 of the License, or (at your option) any later |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
94 version.</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
95 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
96 <p>Mercurial is distributed in the hope that it will be useful, |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
97 but <b>without any warranty</b>; without even the implied |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
98 warranty of <b>merchantability</b> or <b>fitness for a |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
99 particular purpose</b>. See the GNU General Public License for |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
100 more details.</p> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
101 </body> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
102 </html> |