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