Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/macosx/Welcome.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 | fb4b6d5fe100 |
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:
3863
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"> |
2681
259acfb963d1
Update Windows and Mac installers to 0.9.1 release
Lee Cantey <lcantey@gmail.com>
parents:
2516
diff
changeset
|
9 p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} |
1686
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 </style> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 </head> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 <body> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 <p class="p1">This is a prepackaged release of <a href="http://www.selenic.com/mercurial">Mercurial</a> for Mac OS X.</p> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 <p class="p2"><br></p> |
2681
259acfb963d1
Update Windows and Mac installers to 0.9.1 release
Lee Cantey <lcantey@gmail.com>
parents:
2516
diff
changeset
|
16 <br> |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
2681
diff
changeset
|
17 <p> |
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
2681
diff
changeset
|
18 Please be sure to read the latest <a href="http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew">release notes</a>.</p> |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 </body> |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 </html> |