Show More
@@ -1,35 +1,42 b'' | |||||
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> |
|
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> | |
|
2 | <!-- This is the second screen displayed during the install. --> | |||
2 | <html> |
|
3 | <html> | |
3 | <head> |
|
4 | <head> | |
4 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
|
5 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | |
5 | <meta http-equiv="Content-Style-Type" content="text/css"> |
|
6 | <meta http-equiv="Content-Style-Type" content="text/css"> | |
6 | <title></title> |
|
7 | <title></title> | |
7 | <style type="text/css"> |
|
8 | <style type="text/css"> | |
8 | p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} |
|
9 | p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} | |
9 | p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} |
|
10 | p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} | |
10 | p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica} |
|
11 | p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica} | |
11 | p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed} |
|
12 | p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed} | |
12 | span.s1 {text-decoration: underline} |
|
13 | span.s1 {text-decoration: underline} | |
13 | span.s2 {font: 12.0px Courier} |
|
14 | span.s2 {font: 12.0px Courier} | |
14 | </style> |
|
15 | </style> | |
15 | </head> |
|
16 | </head> | |
16 | <body> |
|
17 | <body> | |
17 | <p class="p1"><b>Before you install</b></p> |
|
18 | <p class="p1"><b>Before you install</b></p> | |
18 | <p class="p2"><br></p> |
|
19 | <p class="p2"><br></p> | |
19 | <p class="p3">This is <i>not</i> a stand-alone version of Mercurial.</p> |
|
20 | <p class="p3">This is <i>not</i> a stand-alone version of Mercurial.</p> | |
20 | <p class="p2"><br></p> |
|
21 | <p class="p2"><br></p> | |
21 | <p class="p3">To use it, you must have the Universal MacPython 2.4.3 from <a href="http://www.python.org">www.python.org</a> installed.</p> |
|
22 | <p class="p3">To use it, you must have the Universal MacPython 2.4.3 from <a href="http://www.python.org">www.python.org</a> installed.</p> | |
22 | <p class="p2"><br></p> |
|
23 | <p class="p2"><br></p> | |
23 | <p class="p3">You can download MacPython 2.4.3 from here:</p> |
|
24 | <p class="p3">You can download MacPython 2.4.3 from here:</p> | |
24 | <p class="p4"><span class="s1"><a href="http://www.python.org/ftp/python/2.4.3/Universal-MacPython-2.4.3-2006-04-07.dmg">http://www.python.org/ftp/python/2.4.3/Universal-MacPython-2.4.3-2006-04-07.dmg</a></span></p> |
|
25 | <p class="p4"><span class="s1"><a href="http://www.python.org/ftp/python/2.4.3/Universal-MacPython-2.4.3-2006-04-07.dmg">http://www.python.org/ftp/python/2.4.3/Universal-MacPython-2.4.3-2006-04-07.dmg</a></span></p> | |
25 | <p class="p2"><br></p> |
|
26 | <p class="p2"><br></p> | |
26 | <p class="p1"><b>After you install</b></p> |
|
27 | <p class="p1"><b>After you install</b></p> | |
27 | <p class="p2"><br></p> |
|
28 | <p class="p2"><br></p> | |
28 | <p class="p3">This package installs the <span class="s2">hg</span> executable in <span class="s2">/Library/Frameworks/Python.framework/Versions/Current/bin</span>. This directory may not be in your shell's search path. The MacPython installer will have created an entry in <span class="s2">.profile</span> for it but if your shell doesn't use <span class="s2">.profile</span> you'll need configure it yourself or create a symlink from a directory already in your path.</p> |
|
29 | <p class="p3">This package installs the <span class="s2">hg</span> executable in <span class="s2">/Library/Frameworks/Python.framework/Versions/Current/bin</span>. This directory may not be in your shell's search path. The MacPython installer will have created an entry in <span class="s2">.profile</span> for it but if your shell doesn't use <span class="s2">.profile</span> you'll need configure it yourself or create a symlink from a directory already in your path.</p> | |
29 | <p class="p2"><br></p> |
|
30 | <p class="p2"><br></p> | |
|
31 | <p class="p1"><b>Documentation</b></p> | |||
|
32 | <p class="p2"><br></p> | |||
|
33 | <p class="p3">Visit the <a href="http://www.selenic.com/mercurial">Mercurial web site and wiki</a></p> | |||
|
34 | <p class="p2"><br></p> | |||
|
35 | <p class="p3">There's also a free book, <a href="http://hgbook.red-bean.com/">Distributed revision control with Mercurial</a></p> | |||
|
36 | <p class="p2"><br></p> | |||
30 | <p class="p1"><b>Reporting problems</b></p> |
|
37 | <p class="p1"><b>Reporting problems</b></p> | |
31 | <p class="p2"><br></p> |
|
38 | <p class="p2"><br></p> | |
32 | <p class="p3">If you run into any problems, please file a bug online:</p> |
|
39 | <p class="p3">If you run into any problems, please file a bug online:</p> | |
33 | <p class="p3"><a href="http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts</a></p> |
|
40 | <p class="p3"><a href="http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts</a></p> | |
34 | </body> |
|
41 | </body> | |
35 | </html> |
|
42 | </html> |
@@ -1,19 +1,20 b'' | |||||
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> |
|
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> | |
|
2 | <!-- This is the second screen displayed during the install. --> | |||
2 | <html> |
|
3 | <html> | |
3 | <head> |
|
4 | <head> | |
4 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
|
5 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | |
5 | <meta http-equiv="Content-Style-Type" content="text/css"> |
|
6 | <meta http-equiv="Content-Style-Type" content="text/css"> | |
6 | <title></title> |
|
7 | <title></title> | |
7 | <style type="text/css"> |
|
8 | <style type="text/css"> | |
8 | p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} |
|
9 | p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} | |
9 | p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} |
|
10 | p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} | |
10 | </style> |
|
11 | </style> | |
11 | </head> |
|
12 | </head> | |
12 | <body> |
|
13 | <body> | |
13 | <p class="p1">This is a prepackaged release of <a href="http://www.selenic.com/mercurial">Mercurial</a> for Mac OS X.</p> |
|
14 | <p class="p1">This is a prepackaged release of <a href="http://www.selenic.com/mercurial">Mercurial</a> for Mac OS X.</p> | |
14 | <p class="p2"><br></p> |
|
15 | <p class="p2"><br></p> | |
15 | <br> |
|
16 | <br> | |
16 | <p> |
|
17 | <p> | |
17 | Please be sure to read the latest <a href="http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew">release notes</a>.</p> |
|
18 | Please be sure to read the latest <a href="http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew">release notes</a>.</p> | |
18 | </body> |
|
19 | </body> | |
19 | </html> |
|
20 | </html> |
@@ -1,109 +1,112 b'' | |||||
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 | .indented | |
9 | { |
|
9 | { | |
10 | padding-left: 10pt; |
|
10 | padding-left: 10pt; | |
11 | } |
|
11 | } | |
12 | --> |
|
12 | --> | |
13 | </style> |
|
13 | </style> | |
14 | </head> |
|
14 | </head> | |
15 |
|
15 | |||
16 | <body> |
|
16 | <body> | |
17 | <h1>Mercurial for Windows</h1> |
|
17 | <h1>Mercurial for Windows</h1> | |
18 |
|
18 | |||
19 | <p>Welcome to Mercurial for Windows!</p> |
|
19 | <p>Welcome to Mercurial for Windows!</p> | |
20 |
|
20 | |||
21 | <p>Mercurial is a command-line application. You must run it from |
|
21 | <p>Mercurial is a command-line application. You must run it from | |
22 | the Windows command prompt (or if you're hard core, a <a |
|
22 | the Windows command prompt (or if you're hard core, a <a | |
23 | href="http://www.mingw.org/">MinGW</a> shell).</p> |
|
23 | href="http://www.mingw.org/">MinGW</a> shell).</p> | |
24 |
|
24 | |||
25 | <p><div class="indented"><i>Note: the standard <a |
|
25 | <p><div class="indented"><i>Note: the standard <a | |
26 | href="http://www.mingw.org/">MinGW</a> msys startup script uses |
|
26 | href="http://www.mingw.org/">MinGW</a> msys startup script uses | |
27 | rxvt which has problems setting up standard input and output. |
|
27 | rxvt which has problems setting up standard input and output. | |
28 | Running bash directly works correctly.</i></div> |
|
28 | Running bash directly works correctly.</i></div> | |
29 |
|
29 | |||
30 | <p>For documentation, please visit the <a |
|
30 | <p>For documentation, please visit the <a | |
31 |
href="http://www.selenic.com/mercurial">Mercurial web site</a>. |
|
31 | href="http://www.selenic.com/mercurial">Mercurial web site</a>. | |
|
32 | You can also download a free book, <a | |||
|
33 | href="http://hgbook.red-bean.com/">Distributed revision control | |||
|
34 | with Mercurial</a>.</p> | |||
32 |
|
35 | |||
33 | <p>By default, Mercurial installs to <tt>C:\Mercurial</tt>. The |
|
36 | <p>By default, Mercurial installs to <tt>C:\Mercurial</tt>. The | |
34 | Mercurial command is called <tt>hg.exe</tt>.</p> |
|
37 | Mercurial command is called <tt>hg.exe</tt>.</p> | |
35 |
|
38 | |||
36 | <h1>Testing Mercurial after you've installed it</h1> |
|
39 | <h1>Testing Mercurial after you've installed it</h1> | |
37 |
|
40 | |||
38 | <p>The easiest way to check that Mercurial is installed properly is to |
|
41 | <p>The easiest way to check that Mercurial is installed properly is to | |
39 | just type the following at the command prompt:</p> |
|
42 | just type the following at the command prompt:</p> | |
40 |
|
43 | |||
41 | <pre> |
|
44 | <pre> | |
42 | hg |
|
45 | hg | |
43 | </pre> |
|
46 | </pre> | |
44 |
|
47 | |||
45 | <p>This command should print a useful help message. If it does, |
|
48 | <p>This command should print a useful help message. If it does, | |
46 | other Mercurial commands should work fine for you.</p> |
|
49 | other Mercurial commands should work fine for you.</p> | |
47 |
|
50 | |||
48 | <h1>Configuration notes</h1> |
|
51 | <h1>Configuration notes</h1> | |
49 | <h4>Default editor</h4> |
|
52 | <h4>Default editor</h4> | |
50 | The default editor for commit messages is 'notepad'. You can set the EDITOR |
|
53 | The default editor for commit messages is 'notepad'. You can set the EDITOR | |
51 | (or HGEDITOR) environment variable to specify your preference or set it in |
|
54 | (or HGEDITOR) environment variable to specify your preference or set it in | |
52 | mercurial.ini: |
|
55 | mercurial.ini: | |
53 | <pre> |
|
56 | <pre> | |
54 | [ui] |
|
57 | [ui] | |
55 | editor = whatever |
|
58 | editor = whatever | |
56 | </pre> |
|
59 | </pre> | |
57 |
|
60 | |||
58 | <h4>Configuring a Merge program</h4> |
|
61 | <h4>Configuring a Merge program</h4> | |
59 | It should be emphasized that Mercurial by itself doesn't attempt to do a |
|
62 | It should be emphasized that Mercurial by itself doesn't attempt to do a | |
60 | Merge at the file level, neither does it make any attempt to Resolve the conflicts. |
|
63 | Merge at the file level, neither does it make any attempt to Resolve the conflicts. | |
61 |
|
64 | |||
62 | By default, Mercurial will use the merge program defined by the HGMERGE environment |
|
65 | By default, Mercurial will use the merge program defined by the HGMERGE environment | |
63 | variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information) |
|
66 | variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information) | |
64 |
|
67 | |||
65 | <h1>Reporting problems</h1> |
|
68 | <h1>Reporting problems</h1> | |
66 |
|
69 | |||
67 | <p>Before you report any problems, please consult the <a |
|
70 | <p>Before you report any problems, please consult the <a | |
68 | href="http://www.selenic.com/mercurial">Mercurial web site</a> and |
|
71 | href="http://www.selenic.com/mercurial">Mercurial web site</a> and | |
69 | see if your question is already in our list of <a |
|
72 | see if your question is already in our list of <a | |
70 | href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently |
|
73 | href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently | |
71 | Answered Questions</a> (the "FAQ"). |
|
74 | Answered Questions</a> (the "FAQ"). | |
72 |
|
75 | |||
73 | <p>If you cannot find an answer to your question, please feel |
|
76 | <p>If you cannot find an answer to your question, please feel | |
74 | free to send mail to the Mercurial mailing list, at <a |
|
77 | free to send mail to the Mercurial mailing list, at <a | |
75 | href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>. |
|
78 | href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>. | |
76 | <b>Remember</b>, the more useful information you include in your |
|
79 | <b>Remember</b>, the more useful information you include in your | |
77 | report, the easier it will be for us to help you!</p> |
|
80 | report, the easier it will be for us to help you!</p> | |
78 |
|
81 | |||
79 | <p>If you are IRC-savvy, that's usually the fastest way to get |
|
82 | <p>If you are IRC-savvy, that's usually the fastest way to get | |
80 | help. Go to <tt>#mercurial</tt> on |
|
83 | help. Go to <tt>#mercurial</tt> on | |
81 | <tt>irc.freenode.net</tt>.</p> |
|
84 | <tt>irc.freenode.net</tt>.</p> | |
82 |
|
85 | |||
83 | <h1>Author and copyright information</h1> |
|
86 | <h1>Author and copyright information</h1> | |
84 |
|
87 | |||
85 | <p>Mercurial was written by <a href="http://www.selenic.com">Matt |
|
88 | <p>Mercurial was written by <a href="http://www.selenic.com">Matt | |
86 | Mackall</a>, and is maintained by Matt and a team of |
|
89 | Mackall</a>, and is maintained by Matt and a team of | |
87 | volunteers.</p> |
|
90 | volunteers.</p> | |
88 |
|
91 | |||
89 | <p>The Windows installer was written by <a |
|
92 | <p>The Windows installer was written by <a | |
90 | href="http://www.serpentine.com/blog">Bryan |
|
93 | href="http://www.serpentine.com/blog">Bryan | |
91 | O'Sullivan</a>.</p> |
|
94 | O'Sullivan</a>.</p> | |
92 |
|
95 | |||
93 | <p>Mercurial is Copyright 2005-2007 Matt Mackall and others. |
|
96 | <p>Mercurial is Copyright 2005-2007 Matt Mackall and others. | |
94 | See the <tt>Contributors.txt</tt> file for a list of contributors.</p> |
|
97 | See the <tt>Contributors.txt</tt> file for a list of contributors.</p> | |
95 |
|
98 | |||
96 | <p>Mercurial is free software; you can redistribute it and/or |
|
99 | <p>Mercurial is free software; you can redistribute it and/or | |
97 | modify it under the terms of the <a |
|
100 | modify it under the terms of the <a | |
98 | href="http://www.gnu.org/copyleft/gpl.html">GNU General Public |
|
101 | href="http://www.gnu.org/copyleft/gpl.html">GNU General Public | |
99 | License</a> as published by the Free Software Foundation; either |
|
102 | License</a> as published by the Free Software Foundation; either | |
100 | version 2 of the License, or (at your option) any later |
|
103 | version 2 of the License, or (at your option) any later | |
101 | version.</p> |
|
104 | version.</p> | |
102 |
|
105 | |||
103 | <p>Mercurial is distributed in the hope that it will be useful, |
|
106 | <p>Mercurial is distributed in the hope that it will be useful, | |
104 | but <b>without any warranty</b>; without even the implied |
|
107 | but <b>without any warranty</b>; without even the implied | |
105 | warranty of <b>merchantability</b> or <b>fitness for a |
|
108 | warranty of <b>merchantability</b> or <b>fitness for a | |
106 | particular purpose</b>. See the GNU General Public License for |
|
109 | particular purpose</b>. See the GNU General Public License for | |
107 | more details.</p> |
|
110 | more details.</p> | |
108 | </body> |
|
111 | </body> | |
109 | </html> |
|
112 | </html> |
General Comments 0
You need to be logged in to leave comments.
Login now