Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/macosx/Readme.html @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 4bd0b2f862ba |
children |
rev | line source |
---|---|
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> |
4723
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
2 <!-- This is the second screen displayed during the install. --> |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 <html> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 <head> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 <meta http-equiv="Content-Style-Type" content="text/css"> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 <title></title> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 <style type="text/css"> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica} |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed} |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 span.s1 {text-decoration: underline} |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 span.s2 {font: 12.0px Courier} |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 </style> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 </head> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 <body> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 <p class="p1"><b>Before you install</b></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 <p class="p2"><br></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 <p class="p3">This is <i>not</i> a stand-alone version of Mercurial.</p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 <p class="p2"><br></p> |
4784
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
22 <p class="p3">To use it, you must have the appropriate version of Universal MacPython from <a href="http://www.python.org">www.python.org</a> installed.</p> |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 <p class="p2"><br></p> |
4784
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
24 <p class="p3">You can find more information and download MacPython from here:</p> |
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
25 <p class="p4"><span class="s1"><a href="http://www.python.org/download">http://www.python.org/download</a></span></p> |
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
26 <p class="p2"><br></p> |
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
27 <p class="p3">Or direct links to the latest version are:</p> |
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
28 <p class="p4"><span class="s1"><a href="http://www.python.org/ftp/python/2.5.1/python-2.5.1-macosx.dmg">Python 2.5.1 for Macintosh OS X</a></span></p> |
4bd0b2f862ba
Remove specific version requirement and point to latest versions of Mac Python downloads.
Lee Cantey <lcantey@gmail.com>
parents:
4723
diff
changeset
|
29 <p class="p4"><span class="s1"><a href="http://www.python.org/ftp/python/2.4.4/python-2.4.4-macosx2006-10-18.dmg">Python 2.4.4 for Macintosh OS X</a></span></p> |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 <p class="p2"><br></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
31 <p class="p1"><b>After you install</b></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
32 <p class="p2"><br></p> |
3421
846bf33bf140
Document the change in MacPython distutils installation location
Lee Cantey <lcantey@gmail.com>
parents:
2516
diff
changeset
|
33 <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> |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 <p class="p2"><br></p> |
4723
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
35 <p class="p1"><b>Documentation</b></p> |
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
36 <p class="p2"><br></p> |
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
37 <p class="p3">Visit the <a href="http://www.selenic.com/mercurial">Mercurial web site and wiki</a></p> |
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
38 <p class="p2"><br></p> |
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
39 <p class="p3">There's also a free book, <a href="http://hgbook.red-bean.com/">Distributed revision control with Mercurial</a></p> |
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3421
diff
changeset
|
40 <p class="p2"><br></p> |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
41 <p class="p1"><b>Reporting problems</b></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
42 <p class="p2"><br></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
43 <p class="p3">If you run into any problems, please file a bug online:</p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
44 <p class="p3"><a href="http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts</a></p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
45 </body> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
46 </html> |