annotate mercurial-tests/testData/bin/ReadMe.html @ 294:2e52f00a3c94 Eluru-6.5.x

Update whole hg distribution to 1.5.2
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 07 Sep 2011 19:46:47 +0400
parents 6fada1d52902
children
rev   line source
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
2 <html>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
3 <head>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
4 <title>Mercurial for Windows</title>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
5 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
6 <style type="text/css">
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
7 <!--
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
8 html {
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
9 font-family: sans-serif;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
10 margin: 1em 2em;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
11 }
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
12
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
13 p {
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
14 margin-top: 0.5em;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
15 margin-bottom: 0.5em;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
16 }
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
17
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
18 pre {
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
19 margin: 0.25em 0em;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
20 padding: 0.5em;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
21 background-color: #EEE;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
22 border: thin solid #CCC;
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
23 }
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
24
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
25 .indented {
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
26 padding-left: 10pt;
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
27 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
28 -->
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
29 </style>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
30 </head>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
31
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
32 <body>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
33 <h1>Mercurial for Windows</h1>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
34
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
35 <p>Welcome to Mercurial for Windows!</p>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
36
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
37 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
38 Mercurial is a command-line application. You must run it from
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
39 the Windows command prompt (or if you're hard core, a <a
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
40 href="http://www.mingw.org/">MinGW</a> shell).
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
41 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
42
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
43 <p class="indented">
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
44 <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
45 msys startup script uses rxvt which has problems setting up
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
46 standard input and output. Running bash directly works
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
47 correctly.</i>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
48 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
49
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
50 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
51 For documentation, please visit the <a
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
52 href="http://mercurial.selenic.com/">Mercurial web site</a>.
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
53 You can also download a free book, <a
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
54 href="http://hgbook.red-bean.com/">Mercurial: The Definitive
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
55 Guide</a>.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
56 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
57
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
58 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
59 By default, Mercurial installs to <tt>C:\Program
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
60 Files\Mercurial</tt>. The Mercurial command is called
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
61 <tt>hg.exe</tt>.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
62 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
63
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
64 <h1>Testing Mercurial after you've installed it</h1>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
65
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
66 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
67 The easiest way to check that Mercurial is installed properly is
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
68 to just type the following at the command prompt:
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
69 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
70
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
71 <pre>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
72 hg
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
73 </pre>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
74
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
75 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
76 This command should print a useful help message. If it does,
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
77 other Mercurial commands should work fine for you.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
78 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
79
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
80 <h1>Configuration notes</h1>
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
81 <h4>Default editor</h4>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
82 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
83 The default editor for commit messages is 'notepad'. You can set
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
84 the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
85 to specify your preference or set it in <tt>mercurial.ini</tt>:
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
86 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
87 <pre>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
88 [ui]
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
89 editor = whatever
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
90 </pre>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
91
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
92 <h4>Configuring a Merge program</h4>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
93 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
94 It should be emphasized that Mercurial by itself doesn't attempt
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
95 to do a Merge at the file level, neither does it make any
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
96 attempt to Resolve the conflicts.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
97 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
98
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
99 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
100 By default, Mercurial will use the merge program defined by the
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
101 <tt>HGMERGE</tt> environment variable, or uses the one defined
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
102 in the <tt>mercurial.ini</tt> file. (see <a
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
103 href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram</a>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
104 on the Mercurial Wiki for more information)
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
105 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
106
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
107 <h1>Reporting problems</h1>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
108
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
109 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
110 Before you report any problems, please consult the <a
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
111 href="http://mercurial.selenic.com/">Mercurial web site</a>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
112 and see if your question is already in our list of <a
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
113 href="http://mercurial.selenic.com/wiki/FAQ">Frequently
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
114 Answered Questions</a> (the "FAQ").
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
115 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
116
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
117 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
118 If you cannot find an answer to your question, please feel free
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
119 to send mail to the Mercurial mailing list, at <a
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
120 href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>.
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
121 <b>Remember</b>, the more useful information you include in your
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
122 report, the easier it will be for us to help you!
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
123 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
124
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
125 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
126 If you are IRC-savvy, that's usually the fastest way to get
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
127 help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
128 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
129
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
130 <h1>Author and copyright information</h1>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
131
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
132 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
133 Mercurial was written by <a href="http://www.selenic.com">Matt
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
134 Mackall</a>, and is maintained by Matt and a team of volunteers.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
135 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
136
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
137 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
138 The Windows installer was written by <a
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
139 href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
140 </p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
141
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
142 <p>
294
2e52f00a3c94 Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 88
diff changeset
143 Mercurial is Copyright 2005-2010 Matt Mackall and others. See
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
144 the <tt>Contributors.txt</tt> file for a list of contributors.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
145 </p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
146
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
147 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
148 Mercurial is free software; you can redistribute it and/or
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
149 modify it under the terms of the <a
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
150 href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
294
2e52f00a3c94 Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 88
diff changeset
151 General Public License version 2</a> or any later version.
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
152 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
153
88
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
154 <p>
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
155 Mercurial is distributed in the hope that it will be useful, but
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
156 <b>without any warranty</b>; without even the implied warranty
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
157 of <b>merchantability</b> or <b>fitness for a particular
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
158 purpose</b>. See the GNU General Public License for more
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
159 details.
6fada1d52902 new hg utility
Pavel.Sher
parents: 0
diff changeset
160 </p>
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
161 </body>
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
162 </html>